diff options
author | Dan Carpenter <error27@gmail.com> | 2010-03-28 07:50:05 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-05-19 11:57:27 -0400 |
commit | 124371e33ce733a81fde8419946adb0d6c14f4c0 (patch) | |
tree | bf3d75b8e856057db1e3ce65025d7a13c97d0e83 /drivers/media/video/sn9c102 | |
parent | 67e13e7709736b3b25dda98f92cc7164b210dda6 (diff) |
V4L/DVB: video/sn9c102: improve error handling
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>
Diffstat (limited to 'drivers/media/video/sn9c102')
-rw-r--r-- | drivers/media/video/sn9c102/sn9c102_core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c index cbf8087b286f..28e19daadec9 100644 --- a/drivers/media/video/sn9c102/sn9c102_core.c +++ b/drivers/media/video/sn9c102/sn9c102_core.c | |||
@@ -2295,7 +2295,7 @@ sn9c102_vidioc_s_ctrl(struct sn9c102_device* cam, void __user * arg) | |||
2295 | if (copy_from_user(&ctrl, arg, sizeof(ctrl))) | 2295 | if (copy_from_user(&ctrl, arg, sizeof(ctrl))) |
2296 | return -EFAULT; | 2296 | return -EFAULT; |
2297 | 2297 | ||
2298 | for (i = 0; i < ARRAY_SIZE(s->qctrl); i++) | 2298 | for (i = 0; i < ARRAY_SIZE(s->qctrl); i++) { |
2299 | if (ctrl.id == s->qctrl[i].id) { | 2299 | if (ctrl.id == s->qctrl[i].id) { |
2300 | if (s->qctrl[i].flags & V4L2_CTRL_FLAG_DISABLED) | 2300 | if (s->qctrl[i].flags & V4L2_CTRL_FLAG_DISABLED) |
2301 | return -EINVAL; | 2301 | return -EINVAL; |
@@ -2305,7 +2305,9 @@ sn9c102_vidioc_s_ctrl(struct sn9c102_device* cam, void __user * arg) | |||
2305 | ctrl.value -= ctrl.value % s->qctrl[i].step; | 2305 | ctrl.value -= ctrl.value % s->qctrl[i].step; |
2306 | break; | 2306 | break; |
2307 | } | 2307 | } |
2308 | 2308 | } | |
2309 | if (i == ARRAY_SIZE(s->qctrl)) | ||
2310 | return -EINVAL; | ||
2309 | if ((err = s->set_ctrl(cam, &ctrl))) | 2311 | if ((err = s->set_ctrl(cam, &ctrl))) |
2310 | return err; | 2312 | return err; |
2311 | 2313 | ||