diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2012-11-02 22:02:55 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-11-02 22:02:55 -0400 |
| commit | 0142da417d4b69a3da775c0e84c1583004c76db7 (patch) | |
| tree | 504c450d298f9657156b126e36c94d6356056c39 /drivers/dma/imx-dma.c | |
| parent | 9d0b1472d4ca3a1b93adc62e928160db418e93dd (diff) | |
| parent | 5390967b2f98e6aa46f20eae09580e7db73826b9 (diff) | |
Merge tag 'v3.4.17' into v3.4-rt
This is the 3.4.17 stable release
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 bb787d8e1529..180f5235acc2 100644 --- a/drivers/dma/imx-dma.c +++ b/drivers/dma/imx-dma.c @@ -473,8 +473,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; |