drivers/media/video/et61x251/et61x251_core.c: improve error handling

PATCH In review [email protected] 1 participant 1 message Apr 27, 2010 Media (V4L/DVB)

lore

Share & tools

lore

[email protected]

author

2010-04-27 21:22 UTC #0 lore raw

PATCH 7/11 drivers/media/video/et61x251/et61x251_core.c: improve error handling

From: Dan Carpenter <[email protected]>

The original code doesn't handle the situation where the controller is not found.

Signed-off-by Dan Carpenter <[email protected]>

Cc Luca Risolia <[email protected]>

Cc Mauro Carvalho Chehab <[email protected]>

Cc Laurent Pinchart <[email protected]>

Signed-off-by Andrew Morton <[email protected]>

---

 drivers/media/video/et61x251/et61x251_core.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

drivers/media/video/et61x251/et61x251_core.c renamed from drivers/media/video/et61x251/et61x251_core.c~drivers-media-video-et61x251-et61x251_corec-improve-error-handling +4 -2

diff -puN drivers/media/video/et61x251/et61x251_core.c~drivers-media-video-et61x251-et61x251_corec-improve-error-handling drivers/media/video/et61x251/et61x251_core.c
@@ -1713,7 +1713,7 @@ et61x251_vidioc_s_ctrl(struct et61x251_d
 	if (copy_from_user(&ctrl, arg, sizeof(ctrl)))
 		return -EFAULT;
 
-	for (i = 0; i < ARRAY_SIZE(s->qctrl); i++)
+	for (i = 0; i < ARRAY_SIZE(s->qctrl); i++) {
 		if (ctrl.id == s->qctrl[i].id) {
 			if (s->qctrl[i].flags & V4L2_CTRL_FLAG_DISABLED)
 				return -EINVAL;

@@ -1723,7 +1723,9 @@ et61x251_vidioc_s_ctrl(struct et61x251_d
 			ctrl.value -= ctrl.value % s->qctrl[i].step;
 			break;
 		}
-
+	}
+	if (i == ARRAY_SIZE(s->qctrl))
+		return -EINVAL;
 	if ((err = s->set_ctrl(cam, &ctrl)))
 		return err;