V4L/DVB: video/et61x251: improve error handling
authorDan Carpenter <error27@gmail.com>
Sun, 28 Mar 2010 11:49:45 +0000 (08:49 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 19 May 2010 15:57:26 +0000 (12:57 -0300)
The original code doesn't handle the situation where the controller is
not found.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/et61x251/et61x251_core.c

index e6c23d5098620215041cb652ee049b7bdd0323df..a5cfc76b40b71e26dcc68e41f1f0b8acdf128e51 100644 (file)
@@ -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;