From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Mon, 22 Dec 2008 09:20:32 +0000 (-0300)
Subject: V4L/DVB (9931): em28xx: de-obfuscate vidioc_g_ctrl logic
X-Git-Tag: MMI-PSA29.97-13-9~30449^2~159
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b6070f0756fe1bccda1c8c67a6bfdfa51022b664;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

V4L/DVB (9931): em28xx: de-obfuscate vidioc_g_ctrl logic

vidioc_g_ctrl() were using an uneeded confusing logic. Instead, use the
direct approach.

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 fc41eead640b..4701b6589b10 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -1057,18 +1057,14 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
 	rc = check_dev(dev);
 	if (rc < 0)
 		return rc;
+	rc = 0;
 
 	mutex_lock(&dev->lock);
 
-	if (!dev->board.has_msp34xx)
-		rc = em28xx_get_ctrl(dev, ctrl);
-	else
-		rc = -EINVAL;
-
-	if (rc == -EINVAL) {
+	if (dev->board.has_msp34xx)
 		em28xx_i2c_call_clients(dev, VIDIOC_G_CTRL, ctrl);
-		rc = 0;
-	}
+	else
+		rc = em28xx_get_ctrl(dev, ctrl);
 
 	mutex_unlock(&dev->lock);
 	return rc;