aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/omap3isp/isp.c
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@iki.fi>2015-03-25 19:57:25 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-04-02 16:37:17 -0300
commit697cca21b09ce4c641bce821b90e90b3e95d17f6 (patch)
tree1a9d5bf5bb3bb880eab7748bd6482624b580d5f3 /drivers/media/platform/omap3isp/isp.c
parent[media] media: omap3isp: hist: Move histogram DMA to DMA engine (diff)
downloadlinux-dev-697cca21b09ce4c641bce821b90e90b3e95d17f6.tar.xz
linux-dev-697cca21b09ce4c641bce821b90e90b3e95d17f6.zip
[media] omap3isp: Fix error handling in probe
The mutex was not destroyed correctly if dma_coerce_mask_and_coherent() failed for some reason. Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/platform/omap3isp/isp.c')
-rw-r--r--drivers/media/platform/omap3isp/isp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
index deca80903c3a..fb193b65b5ce 100644
--- a/drivers/media/platform/omap3isp/isp.c
+++ b/drivers/media/platform/omap3isp/isp.c
@@ -2252,7 +2252,7 @@ static int isp_probe(struct platform_device *pdev)
ret = dma_coerce_mask_and_coherent(isp->dev, DMA_BIT_MASK(32));
if (ret)
- return ret;
+ goto error;
platform_set_drvdata(pdev, isp);