projects
/
platform
/
kernel
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1d94aa3
)
V4L/DVB: video_ioctl2: don't return, use break
author
Hans Verkuil
<hverkuil@xs4all.nl>
Tue, 6 Apr 2010 11:14:11 +0000
(08:14 -0300)
committer
Mauro Carvalho Chehab
<mchehab@redhat.com>
Wed, 19 May 2010 15:57:07 +0000
(12:57 -0300)
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>
drivers/media/video/v4l2-ioctl.c
patch
|
blob
|
history
diff --git
a/drivers/media/video/v4l2-ioctl.c
b/drivers/media/video/v4l2-ioctl.c
index
d6975f9
..
571f0c6
100644
(file)
--- 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)