From f5ab647e80587ae96b3661d3fa32c6fc037262af Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Mon, 22 Dec 2008 06:20:32 -0300
Subject: [PATCH] --- yaml --- r: 124431 b: refs/heads/master c:
 b6070f0756fe1bccda1c8c67a6bfdfa51022b664 h: refs/heads/master i:   124429:
 8e1970dc0b3365225a44ee700854a06b20047ff6   124427:
 aa749394e80de56b633e8178b6800068db4e5141   124423:
 c8a892e90c102c926a2bb39ff431bfad7661a225   124415:
 14a62d04d72cd351ee77462b909e1419f120848b v: v3

---
 [refs]                                          |  2 +-
 trunk/drivers/media/video/em28xx/em28xx-video.c | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index dd72cbd0fae0..06fbf20211c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5db0b5e1adff92dac54f2dfb1846a42501c8f7d9
+refs/heads/master: b6070f0756fe1bccda1c8c67a6bfdfa51022b664
diff --git a/trunk/drivers/media/video/em28xx/em28xx-video.c b/trunk/drivers/media/video/em28xx/em28xx-video.c
index fc41eead640b..4701b6589b10 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-video.c
+++ b/trunk/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;