diff --git a/[refs] b/[refs]
index c75077371bb7..4f79a46fa927 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3569abc1c51d24f9c64b214f85477e490b156e3
+refs/heads/master: e9888a1330402050e596b2553e7009fe371c42be
diff --git a/trunk/drivers/media/video/em28xx/em28xx-video.c b/trunk/drivers/media/video/em28xx/em28xx-video.c
index 4ffd064c402a..8996175cc950 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-video.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-video.c
@@ -391,8 +391,6 @@ buffer_setup(struct videobuf_queue *vq, unsigned int *count, unsigned int *size)
 	if (*count < EM28XX_MIN_BUF)
 		*count = EM28XX_MIN_BUF;
 
-	dev->mode = EM28XX_ANALOG_MODE;
-
 	/* Ask tuner to go to analog mode */
 	memset(&f, 0, sizeof(f));
 	f.frequency = dev->ctl_freq;