diff options
author | Dan Carpenter <error27@gmail.com> | 2010-03-28 07:49:45 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-05-19 11:57:26 -0400 |
commit | 67e13e7709736b3b25dda98f92cc7164b210dda6 (patch) | |
tree | 983618369e6a79fbdb3f3be2ce16b89315b6593a /drivers/media/video/et61x251 | |
parent | f24350b48eed2d5518a5f0c2c95d51a655387457 (diff) |
V4L/DVB: 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@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/et61x251')
-rw-r--r-- | drivers/media/video/et61x251/et61x251_core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c index e6c23d509862..a5cfc76b40b7 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) | |||
1713 | if (copy_from_user(&ctrl, arg, sizeof(ctrl))) | 1713 | if (copy_from_user(&ctrl, arg, sizeof(ctrl))) |
1714 | return -EFAULT; | 1714 | return -EFAULT; |
1715 | 1715 | ||
1716 | for (i = 0; i < ARRAY_SIZE(s->qctrl); i++) | 1716 | for (i = 0; i < ARRAY_SIZE(s->qctrl); i++) { |
1717 | if (ctrl.id == s->qctrl[i].id) { | 1717 | if (ctrl.id == s->qctrl[i].id) { |
1718 | if (s->qctrl[i].flags & V4L2_CTRL_FLAG_DISABLED) | 1718 | if (s->qctrl[i].flags & V4L2_CTRL_FLAG_DISABLED) |
1719 | return -EINVAL; | 1719 | return -EINVAL; |
@@ -1723,7 +1723,9 @@ et61x251_vidioc_s_ctrl(struct et61x251_device* cam, void __user * arg) | |||
1723 | ctrl.value -= ctrl.value % s->qctrl[i].step; | 1723 | ctrl.value -= ctrl.value % s->qctrl[i].step; |
1724 | break; | 1724 | break; |
1725 | } | 1725 | } |
1726 | 1726 | } | |
1727 | if (i == ARRAY_SIZE(s->qctrl)) | ||
1728 | return -EINVAL; | ||
1727 | if ((err = s->set_ctrl(cam, &ctrl))) | 1729 | if ((err = s->set_ctrl(cam, &ctrl))) |
1728 | return err; | 1730 | return err; |
1729 | 1731 | ||