From: Ivan Khoronzhuk Date: Wed, 18 Jan 2017 00:28:06 +0000 (+0200) Subject: net: ethernet: ti: davinci_cpdma: correct check on NULL in set rate X-Git-Tag: MMI-PSA29.97-13-9~6152^2~383 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e33c2ef106d17ad8cdb16a0be0ef0daebb2d2c16;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git net: ethernet: ti: davinci_cpdma: correct check on NULL in set rate Check "ch" on NULL first, then get ctlr. Signed-off-by: Ivan Khoronzhuk Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/ti/davinci_cpdma.c b/drivers/net/ethernet/ti/davinci_cpdma.c index d80bff19d4ec..7ecc6b70e7e8 100644 --- a/drivers/net/ethernet/ti/davinci_cpdma.c +++ b/drivers/net/ethernet/ti/davinci_cpdma.c @@ -835,8 +835,8 @@ EXPORT_SYMBOL_GPL(cpdma_chan_get_min_rate); */ int cpdma_chan_set_rate(struct cpdma_chan *ch, u32 rate) { - struct cpdma_ctlr *ctlr = ch->ctlr; unsigned long flags, ch_flags; + struct cpdma_ctlr *ctlr; int ret, prio_mode; u32 rmask; @@ -846,6 +846,7 @@ int cpdma_chan_set_rate(struct cpdma_chan *ch, u32 rate) if (ch->rate == rate) return rate; + ctlr = ch->ctlr; spin_lock_irqsave(&ctlr->lock, flags); spin_lock_irqsave(&ch->lock, ch_flags);