From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Tue, 22 Feb 2011 03:27:41 +0000 (-0300)
Subject: [media] em28xx: Fix return value for s_ctrl
X-Git-Tag: MMI-PSA29.97-13-9~20033^2~328
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=78e51566f0c56daa58f7bbe2591336b7d478c148;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

[media] em28xx: Fix return value for s_ctrl

On some cases, driver returns 1. This should be OK, but qv4l2 is too
strict about return values.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index f34d524ccb09..1ddd3ee22812 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -1452,7 +1452,7 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
 			rc = em28xx_audio_analog_set(dev);
 		}
 	}
-	return rc;
+	return (rc < 0) ? rc : 0;
 }
 
 static int vidioc_g_tuner(struct file *file, void *priv,