From cfe1cbd72c0886322c08ac69af8ef6797652667d Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Sun, 1 Jul 2012 21:38:03 -0300
Subject: [PATCH] --- yaml --- r: 311897 b: refs/heads/master c:
 c6cff169268bba9de687acf317ac24aa038cc263 h: refs/heads/master i:   311895:
 d4623d8e1be741e61ce75e013e0a75027dfaf6c4 v: v3

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

diff --git a/[refs] b/[refs]
index fb60c4a64d29..4d282a78f509 100644
--- 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
index bf79003bd8f6..080e11157e5f 100644
--- 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) {