diff options
| author | Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org> | 2017-01-18 01:28:06 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-18 22:46:01 +0100 |
| commit | e33c2ef106d17ad8cdb16a0be0ef0daebb2d2c16 (patch) | |
| tree | 192550e8c29061b72074fe11463d8296369e2e74 | |
| parent | Merge branch 'vhost_net-batching' (diff) | |
| download | linux-e33c2ef106d17ad8cdb16a0be0ef0daebb2d2c16.tar.xz linux-e33c2ef106d17ad8cdb16a0be0ef0daebb2d2c16.zip | |
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 <ivan.khoronzhuk@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/ti/davinci_cpdma.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); |