summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2012-10-21 19:58:30 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-31 10:03:02 -0700
commit7e8cec32110be45739569e04f35d83d47064dd86 (patch)
tree073ee0fb99f3e1e42d1ba0ad499865624be2385e /drivers
parent73cb40932358f82d55117a70a0d38026923e823f (diff)
downloadlinux-3.10-7e8cec32110be45739569e04f35d83d47064dd86.tar.gz
linux-3.10-7e8cec32110be45739569e04f35d83d47064dd86.tar.bz2
linux-3.10-7e8cec32110be45739569e04f35d83d47064dd86.zip
dmaengine: imx-dma: fix missing unlock on error in imxdma_xfer_desc()
commit 720dfd250e48a8c7fd1b2b8645955413989c4ee0 upstream. Add the missing unlock on the error handling path in function imxdma_xfer_desc(). Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/dma/imx-dma.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
index bb787d8e152..180f5235acc 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;