diff --git a/[refs] b/[refs]
index 068f3938d6ca..eb4b7f23ae6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bdf398eb09e3f2e1fd1acb50960ce93fe380e847
+refs/heads/master: f1990a9c39d957e6896fc506fc5388b7f302c429
diff --git a/trunk/drivers/media/video/em28xx/em28xx-core.c b/trunk/drivers/media/video/em28xx/em28xx-core.c
index 9de0f5017f39..2842ddf6ddac 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-core.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-core.c
@@ -328,7 +328,7 @@ static int set_ac97_input(struct em28xx *dev)
 	   em28xx should point to LINE IN, while AC97 should use VIDEO
 	 */
 	if (amux == EM28XX_AMUX_VIDEO2)
-		amux = dev->ctl_ainput;
+		amux = EM28XX_AMUX_VIDEO;
 
 	/* Mute all entres but the one that were selected */
 	for (i = 0; i < ARRAY_SIZE(inputs); i++) {