From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Sun, 1 Feb 2015 15:06:17 +0000 (-0300)
Subject: [media] soc-camera: remove redundant code
X-Git-Tag: v4.0-rc1~130^2~122
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=41bc765f1e46ec7fd182573178c9ecd949c6c079;p=linux.git

[media] soc-camera: remove redundant code

A hunk, removing this code has been lost between versions 6 and 7 of
patch "soc-camera: add V4L2-async support." The code is harmless, but
redundant.

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 4105a9ed5f71..cee7b56f8404 100644
--- a/drivers/media/platform/soc_camera/soc_camera.c
+++ b/drivers/media/platform/soc_camera/soc_camera.c
@@ -1797,8 +1797,6 @@ static int soc_camera_probe(struct soc_camera_host *ici,
 		mutex_unlock(&ici->clk_lock);
 	}
 eadd:
-	video_device_release(icd->vdev);
-	icd->vdev = NULL;
 	if (icd->vdev) {
 		video_device_release(icd->vdev);
 		icd->vdev = NULL;