[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20100328114945.GV5069@bicker>
Date: Sun, 28 Mar 2010 14:49:45 +0300
From: Dan Carpenter <error27@...il.com>
To: Luca Risolia <luca.risolia@...dio.unibo.it>
Cc: Mauro Carvalho Chehab <mchehab@...radead.org>,
Laurent Pinchart <laurent.pinchart@...asonboard.com>,
Alexey Dobriyan <adobriyan@...il.com>,
Andreas Mohr <andi@...as.de>, linux-usb@...r.kernel.org,
linux-media@...r.kernel.org, linux-kernel@...r.kernel.org,
kernel-janitors@...r.kernel.org
Subject: [patch] video/et61x251: improve error handling
The original code doesn't handle the situation where the controller is
not found.
Signed-off-by: Dan Carpenter <error27@...il.com>
diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c
index e6c23d5..a5cfc76 100644
--- a/drivers/media/video/et61x251/et61x251_core.c
+++ b/drivers/media/video/et61x251/et61x251_core.c
@@ -1713,7 +1713,7 @@ et61x251_vidioc_s_ctrl(struct et61x251_device* cam, void __user * arg)
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_device* cam, void __user * arg)
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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists