leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: ethernet: ti: davinci_cpdma: correct check on NULL in set rate

Browse Source 
Check "ch" on NULL first, then get ctlr.

Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ivan Khoronzhuk
2017-01-18 02:28:06 +02:00
committed by David S. Miller
parent e3e37e7017
commit e33c2ef106
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/ethernet/ti/davinci_cpdma.c
View File

@@ -835,8 +835,8 @@ EXPORT_SYMBOL_GPL(cpdma_chan_get_min_rate);
*/ */
int cpdma_chan_set_rate(struct cpdma_chan *ch, u32 rate) int cpdma_chan_set_rate(struct cpdma_chan *ch, u32 rate)
{ {
struct cpdma_ctlr *ctlr = ch->ctlr;
unsigned long flags, ch_flags; unsigned long flags, ch_flags;
struct cpdma_ctlr *ctlr;
int ret, prio_mode; int ret, prio_mode;
u32 rmask; u32 rmask;
@@ -846,6 +846,7 @@ int cpdma_chan_set_rate(struct cpdma_chan *ch, u32 rate)
if (ch->rate == rate) if (ch->rate == rate)
return rate; return rate;
ctlr = ch->ctlr;
spin_lock_irqsave(&ctlr->lock, flags); spin_lock_irqsave(&ctlr->lock, flags);
spin_lock_irqsave(&ch->lock, ch_flags); spin_lock_irqsave(&ch->lock, ch_flags);