V4L/DVB: video/zc0301: improve error handling
authorDan Carpenter <error27@gmail.com>
Sun, 28 Mar 2010 11:49:20 +0000 (08:49 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 19 May 2010 15:57:26 +0000 (12:57 -0300)
Return an error if 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/zc0301/zc0301_core.c

index e44e4b5f3e50a5231d2cc957679592ad6ab29d25..bb51cfb0c647eaa6e9bfee723e46e02a3a13490d 100644 (file)
@@ -1153,7 +1153,7 @@ zc0301_vidioc_s_ctrl(struct zc0301_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;
@@ -1163,7 +1163,9 @@ zc0301_vidioc_s_ctrl(struct zc0301_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;