diff --git a/[refs] b/[refs]
index eee2d3c62a04..ed62b728142b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1a470fbd987b28e64287718917faf8caf67a055
+refs/heads/master: 6d9f13c47a009ccbaf40c2e388ab349690dd8000
diff --git a/trunk/drivers/media/video/cx25840/cx25840-core.c b/trunk/drivers/media/video/cx25840/cx25840-core.c
index b3b5b17dc8e7..25eb3bec9e5d 100644
--- a/trunk/drivers/media/video/cx25840/cx25840-core.c
+++ b/trunk/drivers/media/video/cx25840/cx25840-core.c
@@ -1383,7 +1383,7 @@ static int cx25840_log_status(struct v4l2_subdev *sd)
 static int cx25840_command(struct i2c_client *client, unsigned cmd, void *arg)
 {
 	/* ignore this command */
-	if (cmd == TUNER_SET_TYPE_ADDR)
+	if (cmd == TUNER_SET_TYPE_ADDR || cmd == TUNER_SET_CONFIG)
 		return 0;
 
 	/* Old-style drivers rely on initialization on first use, so