From 10008544683729c886e749dd518779bcefa35144 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Wed, 21 Jan 2009 17:06:42 -0300
Subject: [PATCH] --- yaml --- r: 137727 b: refs/heads/master c:
 07f7db4ce7b29d431553b426e0dcb720c5297a4b h: refs/heads/master i:   137725:
 5aff9096a112b0074e35a7b962098bcdfe27b544   137723:
 5cab17d034a51e880e133666f2a7dd31a8476875   137719:
 31ed4a547c87f599d350fe3bc577d8ef262c96ca   137711:
 bcdf8b801af034d26a2da5930c9adb145a4d14ac   137695:
 447f0a4bafac89361a0d56041e9e15f0e693a612   137663:
 fd8c211846be80c85f15b1e12200e45be1202138   137599:
 84075fcc714f87bd35bc77e372fb189b9aa334cf   137471:
 2e32a7919a9197a6c935e4b230db622908d1ad2e   137215:
 db91301455c129402251b6435a6e6c198d10c30b v: v3

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

diff --git a/[refs] b/[refs]
index ce48ffad62a8..9b2ec8a9c2eb 100644
--- 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
index 8e61b2ca9167..d8b45b5ee041 100644
--- 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;