diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-06 16:51:06 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-06 16:51:06 +0100 |
| commit | 66267ee58732bb4c21c7bbba004ee481b8ad2b30 (patch) | |
| tree | bf7f72e623d7c1ca6472e0a1286e802cd3bff139 /drivers/dma/imx-dma.c | |
| parent | ARM: pxa: use module_platform_driver macro (diff) | |
| parent | zynq: move static peripheral mappings (diff) | |
| download | linux-66267ee58732bb4c21c7bbba004ee481b8ad2b30.tar.xz linux-66267ee58732bb4c21c7bbba004ee481b8ad2b30.zip | |
Merge branch 'arm-next' of git://git.xilinx.com/linux-xlnx into next/cleanup
From Michal Simek:
* 'arm-next' of git://git.xilinx.com/linux-xlnx:
zynq: move static peripheral mappings
zynq: remove use of CLKDEV_LOOKUP
zynq: use pl310 device tree bindings
zynq: use GIC device tree bindings
+ Linux 3.7-rc3
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 a3a8270e76fb..dbf0e6f8de8a 100644 --- a/drivers/dma/imx-dma.c +++ b/drivers/dma/imx-dma.c @@ -513,8 +513,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; |