Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6-omap-h63xx.git] / drivers / media / video / em28xx / em28xx-core.c

diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
index 5d1482280e45c1817b5d0f8e8145af8273beeb13..f8504518586abadc2fb27208b331c2010327596b 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/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;
        }