summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2010-04-06 13:14:11 +0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-19 17:57:07 +0200
commit3f5e18249ce0d71a900bfdb8df327269483e730d (patch)
tree70db9a808484a79c2dc93e23be2ad9f9b9d2e079 /drivers
parentV4L/DVB: video_ioctl2: do not replace arg with NULL for _IO() ioctls (diff)
downloadlinux-3f5e18249ce0d71a900bfdb8df327269483e730d.tar.xz
linux-3f5e18249ce0d71a900bfdb8df327269483e730d.zip
V4L/DVB: video_ioctl2: don't return, use break
You want to be able to reach the debug code at the end of this function, so don't use return, use break. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/v4l2-ioctl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c
index d6975f9c3722..571f0c6e7c83 100644
--- a/drivers/media/video/v4l2-ioctl.c
+++ b/drivers/media/video/v4l2-ioctl.c
@@ -1072,7 +1072,7 @@ static long __video_do_ioctl(struct file *file,
id &= ~curr_id;
}
if (i <= index)
- return -EINVAL;
+ break;
v4l2_video_std_construct(p, curr_id, descr);
@@ -1597,7 +1597,7 @@ static long __video_do_ioctl(struct file *file,
v4l2_std_id std = vfd->current_norm;
if (p->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
- return -EINVAL;
+ break;
ret = 0;
if (ops->vidioc_g_std)