---

yaml --- r: 124431 b: refs/heads/master c: b6070f0 h: refs/heads/master i: 124429: 8e1970d 124427: aa74939 124423: c8a892e 124415: 14a62d0 v: v3
git-mirror · Dec 30, 2008 · f5ab647 · f5ab647
1 parent 5259018
commit f5ab647
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git 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
@@ -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;