From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Mon, 9 Mar 2015 06:39:33 +0000 (-0300)
Subject: [media] soc-camera: Unregister v4l2 clock in the OF bind error path
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2af12f025870f664244defab14796da2fdb5009e;p=linux-beck.git

[media] soc-camera: Unregister v4l2 clock in the OF bind error path

The v4l2 clock registered in soc_of_bind() must be unregistered if an
error occurs and makes the function fail.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
---

diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c
index b26d4d4c03d4..2a400d424637 100644
--- a/drivers/media/platform/soc_camera/soc_camera.c
+++ b/drivers/media/platform/soc_camera/soc_camera.c
@@ -1661,6 +1661,8 @@ static int soc_of_bind(struct soc_camera_host *ici,
 	ret = v4l2_async_notifier_register(&ici->v4l2_dev, &sasc->notifier);
 	if (!ret)
 		return 0;
+
+	v4l2_clk_unregister(icd->clk);
 eclkreg:
 	icd->clk = NULL;
 	platform_device_del(sasc->pdev);