From: Dan Carpenter <error27@gmail.com>
Date: Wed, 5 May 2010 06:01:30 +0000 (-0300)
Subject: V4L/DVB: s2255drv: return if vdev not found
X-Git-Tag: MMI-PSA29.97-13-9~23880^2~8
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=aab9796f5580a988c46c130a727cdc398a05317b;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

V4L/DVB: s2255drv: return if vdev not found

The original code didn't handle the case where vdev was not found so I
added a check for that.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Cc: linux-dev@sensoray.com
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c
index ac9c40cf5835..1f9a49e054a8 100644
--- a/drivers/media/video/s2255drv.c
+++ b/drivers/media/video/s2255drv.c
@@ -1716,11 +1716,15 @@ static int s2255_open(struct file *file)
 	dprintk(1, "s2255: open called (dev=%s)\n",
 		video_device_node_name(vdev));
 
-	for (i = 0; i < MAX_CHANNELS; i++)
+	for (i = 0; i < MAX_CHANNELS; i++) {
 		if (&dev->vdev[i] == vdev) {
 			cur_channel = i;
 			break;
 		}
+	}
+	if (i == MAX_CHANNELS)
+		return -ENODEV;
+
 	/*
 	 * open lock necessary to prevent multiple instances
 	 * of v4l-conf (or other programs) from simultaneously