---

yaml --- r: 137727 b: refs/heads/master c: 07f7db4 h: refs/heads/master i: 137725: 5aff909 137723: 5cab17d 137719: 31ed4a5 137711: bcdf8b8 137695: 447f0a4 137663: fd8c211 137599: 84075fc 137471: 2e32a79 137215: db91301 v: v3
git-mirror · Mar 30, 2009 · 1000854 · 1000854
1 parent 724e1d8
commit 1000854
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71bf2e08ce197ab7a92215cb4e08a68c755e32f9
+refs/heads/master: 07f7db4ce7b29d431553b426e0dcb720c5297a4b
diff --git a/trunk/drivers/media/video/em28xx/em28xx-video.c b/trunk/drivers/media/video/em28xx/em28xx-video.c
@@ -1008,8 +1008,13 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
 
 	if (dev->board.has_msp34xx)
 		em28xx_i2c_call_clients(dev, VIDIOC_G_CTRL, ctrl);
-	else
+	else {
 		rc = em28xx_get_ctrl(dev, ctrl);
+		if (rc < 0) {
+			em28xx_i2c_call_clients(dev, VIDIOC_G_CTRL, ctrl);
+			rc = 0;
+		}
+	}
 
 	mutex_unlock(&dev->lock);
 	return rc;