diff --git a/[refs] b/[refs]
index edd1a37a17d8..b7b28c7ea410 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3fbf930951462871848b5b504fa4a10ab06d2fee
+refs/heads/master: de84830e6959b046a99da3be12246458f4ab9825
diff --git a/trunk/drivers/media/video/em28xx/em28xx-core.c b/trunk/drivers/media/video/em28xx/em28xx-core.c
index 5d1482280e45..f8504518586a 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-core.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-core.c
@@ -497,7 +497,8 @@ int em28xx_audio_setup(struct em28xx *dev)
 		dev->audio_mode.i2s_5rates = 1;
 	}
 
-	if (!(cfg & EM28XX_CHIPCFG_AC97)) {
+	if ((cfg & EM28XX_CHIPCFG_AUDIOMASK) != EM28XX_CHIPCFG_AC97) {
+		/* Skip the code that does AC97 vendor detection */
 		dev->audio_mode.ac97 = EM28XX_NO_AC97;
 		goto init_audio;
 	}