Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e33c2ef1 authored by Ivan Khoronzhuk's avatar Ivan Khoronzhuk Committed by David S. Miller
Browse files

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



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

Signed-off-by: default avatarIvan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e3e37e70

drivers/net/ethernet/ti/davinci_cpdma.c

+2 −1
Original line number Diff line number Diff line
@@ -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);