summaryrefslogtreecommitdiffstats
path: root/drivers/media/common
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-02-07 11:25:05 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 12:42:42 -0300
commit5a5b9647af504a326c02ecbc58ca4224fb408511 (patch)
treec4afc2006fe5a41907535c21f0124c96d69b66e5 /drivers/media/common
parent1b8dac150a01e2312d8e3fedd6462a0ec34c96d0 (diff)
downloadkernel-crypto-5a5b9647af504a326c02ecbc58ca4224fb408511.tar.gz
kernel-crypto-5a5b9647af504a326c02ecbc58ca4224fb408511.tar.xz
kernel-crypto-5a5b9647af504a326c02ecbc58ca4224fb408511.zip
V4L/DVB (10500): saa7146: setting control while capturing should return EBUSY, not EINVAL.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/common')
-rw-r--r--drivers/media/common/saa7146_video.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c
index a2a8847e678..1f837c1f7f7 100644
--- a/drivers/media/common/saa7146_video.c
+++ b/drivers/media/common/saa7146_video.c
@@ -697,7 +697,7 @@ static int vidioc_s_ctrl(struct file *file, void *fh, struct v4l2_control *c)
if (IS_CAPTURE_ACTIVE(fh) != 0) {
DEB_D(("V4L2_CID_HFLIP while active capture.\n"));
mutex_unlock(&dev->lock);
- return -EINVAL;
+ return -EBUSY;
}
vv->hflip = c->value;
break;
@@ -705,7 +705,7 @@ static int vidioc_s_ctrl(struct file *file, void *fh, struct v4l2_control *c)
if (IS_CAPTURE_ACTIVE(fh) != 0) {
DEB_D(("V4L2_CID_VFLIP while active capture.\n"));
mutex_unlock(&dev->lock);
- return -EINVAL;
+ return -EBUSY;
}
vv->vflip = c->value;
break;