diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-02-07 09:25:05 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:42:42 -0400 |
commit | 5a5b9647af504a326c02ecbc58ca4224fb408511 (patch) | |
tree | c4afc2006fe5a41907535c21f0124c96d69b66e5 /drivers/media/common | |
parent | 1b8dac150a01e2312d8e3fedd6462a0ec34c96d0 (diff) |
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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c index a2a8847e6789..1f837c1f7f74 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) | |||
697 | if (IS_CAPTURE_ACTIVE(fh) != 0) { | 697 | if (IS_CAPTURE_ACTIVE(fh) != 0) { |
698 | DEB_D(("V4L2_CID_HFLIP while active capture.\n")); | 698 | DEB_D(("V4L2_CID_HFLIP while active capture.\n")); |
699 | mutex_unlock(&dev->lock); | 699 | mutex_unlock(&dev->lock); |
700 | return -EINVAL; | 700 | return -EBUSY; |
701 | } | 701 | } |
702 | vv->hflip = c->value; | 702 | vv->hflip = c->value; |
703 | break; | 703 | break; |
@@ -705,7 +705,7 @@ static int vidioc_s_ctrl(struct file *file, void *fh, struct v4l2_control *c) | |||
705 | if (IS_CAPTURE_ACTIVE(fh) != 0) { | 705 | if (IS_CAPTURE_ACTIVE(fh) != 0) { |
706 | DEB_D(("V4L2_CID_VFLIP while active capture.\n")); | 706 | DEB_D(("V4L2_CID_VFLIP while active capture.\n")); |
707 | mutex_unlock(&dev->lock); | 707 | mutex_unlock(&dev->lock); |
708 | return -EINVAL; | 708 | return -EBUSY; |
709 | } | 709 | } |
710 | vv->vflip = c->value; | 710 | vv->vflip = c->value; |
711 | break; | 711 | break; |