projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0ff4e41)
[media] omap3isp: Fix error handling in probe
authorSakari Ailus <sakari.ailus@iki.fi>
Wed, 25 Mar 2015 22:57:25 +0000 (19:57 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Thu, 2 Apr 2015 19:37:17 +0000 (16:37 -0300)
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>
drivers/media/platform/omap3isp/isp.c patch | blob | blame | history

diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
index deca80903c3a08fd59e875b110d4cb0fa3b5189f..fb193b65b5ced9777234163fd135b0463d649117 100644 (file)
--- 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);