From: Sakari Ailus <sakari.ailus@iki.fi>
Date: Wed, 25 Mar 2015 22:57:25 +0000 (-0300)
Subject: [media] omap3isp: Fix error handling in probe
X-Git-Tag: v4.1-rc1~59^2~1^2~265
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=697cca21b09ce4c641bce821b90e90b3e95d17f6;p=thirdparty%2Fkernel%2Flinux.git

[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>
---

diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
index deca80903c3a0..fb193b65b5ced 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);