This is an automatic generated email to let you know that the following patch 
were queued at the 
http://git.linuxtv.org/v4l-dvb.git tree:

Subject: V4L/DVB: video/zc0301: improve error handling
Author:  Dan Carpenter <[email protected]>
Date:    Sun Mar 28 08:49:20 2010 -0300

Return an error if the controller is not found.

Signed-off-by: Dan Carpenter <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>

 drivers/media/video/zc0301/zc0301_core.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

---

http://git.linuxtv.org/v4l-dvb.git?a=commitdiff;h=5679c39108ca79e88094e32024aa9f0f2c8d330c

diff --git a/drivers/media/video/zc0301/zc0301_core.c 
b/drivers/media/video/zc0301/zc0301_core.c
index e44e4b5..bb51cfb 100644
--- a/drivers/media/video/zc0301/zc0301_core.c
+++ b/drivers/media/video/zc0301/zc0301_core.c
@@ -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;
 

_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to