From: Hans Verkuil Date: Sat, 7 Feb 2009 14:25:05 +0000 (-0300) Subject: V4L/DVB (10500): saa7146: setting control while capturing should return EBUSY, not... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5a5b9647af504a326c02ecbc58ca4224fb408511;p=mv-sheeva.git V4L/DVB (10500): saa7146: setting control while capturing should return EBUSY, not EINVAL. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- 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;