Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 321986
b: refs/heads/master
c: f37c54b
h: refs/heads/master
v: v3
  • Loading branch information
Julia Lawall authored and David S. Miller committed Aug 14, 2012
1 parent 8b98ad2 commit 4048a5c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: aadf31de16a7b2878af00a02e6557df84efa784b
refs/heads/master: f37c54b6a6c56489221d42ff27305e4f8098e34b
3 changes: 2 additions & 1 deletion trunk/drivers/net/ethernet/ti/davinci_cpdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 4048a5c

Please sign in to comment.