summaryrefslogtreecommitdiff
path: root/linux/drivers/media/common/saa7146_video.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-02-07 15:25:05 +0100
committerHans Verkuil <hverkuil@xs4all.nl>2009-02-07 15:25:05 +0100
commit7a1cf2bbfb14fef2c4debf9f474cd0ed65a7c65e (patch)
tree15894f10e5041f08363a4ab34f6dd4fda2903661 /linux/drivers/media/common/saa7146_video.c
parent2f363ae420765f2ca6c9a3263649936f10f25138 (diff)
downloadmediapointer-dvb-s2-7a1cf2bbfb14fef2c4debf9f474cd0ed65a7c65e.tar.gz
mediapointer-dvb-s2-7a1cf2bbfb14fef2c4debf9f474cd0ed65a7c65e.tar.bz2
saa7146: setting control while capturing should return EBUSY, not EINVAL.
From: Hans Verkuil <hverkuil@xs4all.nl> Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/common/saa7146_video.c')
-rw-r--r--linux/drivers/media/common/saa7146_video.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/common/saa7146_video.c b/linux/drivers/media/common/saa7146_video.c
index 6536853c1..240757afb 100644
--- a/linux/drivers/media/common/saa7146_video.c
+++ b/linux/drivers/media/common/saa7146_video.c
@@ -698,7 +698,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;
@@ -706,7 +706,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;