]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
V4L/DVB (10500): saa7146: setting control while capturing should return EBUSY, not...
authorHans Verkuil <hverkuil@xs4all.nl>
Sat, 7 Feb 2009 14:25:05 +0000 (11:25 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 30 Mar 2009 15:42:42 +0000 (12:42 -0300)
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/common/saa7146_video.c

index a2a8847e67892abef1892ed024ba8c73c9f0b894..1f837c1f7f740aba7692b177ad8b6c811f672036 100644 (file)
@@ -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;