diff options
| author |   David S. Miller <davem@davemloft.net> | 2012-08-22 14:21:38 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-22 14:21:38 -0700 |
| commit | 1304a7343b30fc4f16045412efdbb4179a3d9255 (patch) | |
| tree | 83d667ac4f62e30f70305ce4cc7e030e3465f92e /drivers/net/ethernet/ti | |
| parent | team: add support for non-ethernet devices (diff) | |
| parent | Merge branch 'akpm' (Andrew's patch-bomb) (diff) | |
| download | linux-dev-1304a7343b30fc4f16045412efdbb4179a3d9255.tar.xz linux-dev-1304a7343b30fc4f16045412efdbb4179a3d9255.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/ti')
| -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 3b5c4571b55e..d15c888e9df8 100644 --- a/drivers/net/ethernet/ti/davinci_cpdma.c +++ b/drivers/net/ethernet/ti/davinci_cpdma.c @@ -538,11 +538,12 @@ EXPORT_SYMBOL_GPL(cpdma_chan_create); int cpdma_chan_destroy(struct cpdma_chan *chan) { - struct cpdma_ctlr *ctlr = chan->ctlr; + struct cpdma_ctlr *ctlr; unsigned long flags; if (!chan) return -EINVAL; + ctlr = chan->ctlr; spin_lock_irqsave(&ctlr->lock, flags); if (chan->state != CPDMA_STATE_IDLE) |