aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorAndre Bartke <andre.bartke@gmail.com>2011-06-10 07:57:54 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-07-01 15:51:34 -0300
commit258c05637d6b6df2478a2808a3d2350c3c6782d6 (patch)
treede8712eccba08ddb0c1c3622e5fcd977946a1551 /drivers/media/video
parent383e4f69879d11c86ebdd38b3356f6d0690fb4cc (diff)
downloadkernel_samsung_aries-258c05637d6b6df2478a2808a3d2350c3c6782d6.zip
kernel_samsung_aries-258c05637d6b6df2478a2808a3d2350c3c6782d6.tar.gz
kernel_samsung_aries-258c05637d6b6df2478a2808a3d2350c3c6782d6.tar.bz2
[media] V4L: mx1-camera: fix uninitialized variable
mx1_camera_add_device() can return an uninitialized value of ret. Signed-off-by: Andre Bartke <andre.bartke@gmail.com> [g.liakhovetski@gmx.de: modified the fix to remove "ret" completely] Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/mx1_camera.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/media/video/mx1_camera.c b/drivers/media/video/mx1_camera.c
index bc0c23a..63f8a0c 100644
--- a/drivers/media/video/mx1_camera.c
+++ b/drivers/media/video/mx1_camera.c
@@ -444,12 +444,9 @@ static int mx1_camera_add_device(struct soc_camera_device *icd)
{
struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
struct mx1_camera_dev *pcdev = ici->priv;
- int ret;
- if (pcdev->icd) {
- ret = -EBUSY;
- goto ebusy;
- }
+ if (pcdev->icd)
+ return -EBUSY;
dev_info(icd->dev.parent, "MX1 Camera driver attached to camera %d\n",
icd->devnum);
@@ -458,8 +455,7 @@ static int mx1_camera_add_device(struct soc_camera_device *icd)
pcdev->icd = icd;
-ebusy:
- return ret;
+ return 0;
}
static void mx1_camera_remove_device(struct soc_camera_device *icd)