---

yaml --- r: 311897 b: refs/heads/master c: c6cff16 h: refs/heads/master i: 311895: d4623d8 v: v3
git-mirror · Jul 6, 2012 · cfe1cbd · cfe1cbd
1 parent e0a8d99
commit cfe1cbd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ac60acb5491df565141c0e3a87d7148a865fe36
+refs/heads/master: c6cff169268bba9de687acf317ac24aa038cc263
diff --git a/trunk/drivers/media/video/cx23885/cx23885-cards.c b/trunk/drivers/media/video/cx23885/cx23885-cards.c
@@ -963,7 +963,7 @@ int cx23885_tuner_callback(void *priv, int component, int command, int arg)
 	struct cx23885_dev *dev = port->dev;
 	u32 bitmask = 0;
 
-	if (command == XC2028_RESET_CLK)
+	if ((command == XC2028_RESET_CLK) || (command == XC2028_I2C_FLUSH))
 		return 0;
 
 	if (command != 0) {