diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-26 14:59:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-26 14:59:01 -0700 |
| commit | f761237eee55222fdb509c79e784a67ab3d72cbd (patch) | |
| tree | a07de02671fe0967a3b23f4f9fecf1a70555fb14 /drivers/dma/imx-dma.c | |
| parent | 64b1cbaa1068f38994230df2aa0fee7033008399 (diff) | |
| parent | 26fd12209c08fe947be1828896ef4ffc5bd0e6df (diff) | |
| download | linux-3.10-f761237eee55222fdb509c79e784a67ab3d72cbd.tar.gz linux-3.10-f761237eee55222fdb509c79e784a67ab3d72cbd.tar.bz2 linux-3.10-f761237eee55222fdb509c79e784a67ab3d72cbd.zip | |
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dmaengine fixes from Vinod Koul:
"Three fixes for slave dmanegine.
Two are for typo omissions in sifr dmaengine driver and the last one
is for the imx driver fixing a missing unlock"
* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
dmaengine: sirf: fix a typo in moving running dma_desc to active queue
dmaengine: sirf: fix a typo in dma_prep_interleaved
dmaengine: imx-dma: fix missing unlock on error in imxdma_xfer_desc()
Diffstat (limited to 'drivers/dma/imx-dma.c')
| -rw-r--r-- | drivers/dma/imx-dma.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c index f11b5b2b1a1..7d9554cc497 100644 --- a/drivers/dma/imx-dma.c +++ b/drivers/dma/imx-dma.c @@ -474,8 +474,10 @@ static int imxdma_xfer_desc(struct imxdma_desc *d) slot = i; break; } - if (slot < 0) + if (slot < 0) { + spin_unlock_irqrestore(&imxdma->lock, flags); return -EBUSY; + } imxdma->slots_2d[slot].xsr = d->x; imxdma->slots_2d[slot].ysr = d->y; |