V4L/DVB (10122): em28xx: don't load em28xx-alsa for em2870 based devices
authorDevin Heitmueller <dheitmueller@linuxtv.org>
Tue, 30 Dec 2008 01:43:55 +0000 (22:43 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 30 Dec 2008 11:40:37 +0000 (09:40 -0200)
Like the em2874, the em2870 does not have any analog support, so don't bother
loading the em28xx-alsa module.

Signed-off-by: Devin Heitmueller <dheitmueller@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/em28xx/em28xx-core.c

index ac735f25283ce5a7053bf2ebda3f2649120a5340..5d1482280e45c1817b5d0f8e8145af8273beeb13 100644 (file)
@@ -465,7 +465,7 @@ int em28xx_audio_setup(struct em28xx *dev)
        int vid1, vid2, feat, cfg;
        u32 vid;
 
-       if (dev->chip_id == CHIP_ID_EM2874) {
+       if (dev->chip_id == CHIP_ID_EM2870 || dev->chip_id == CHIP_ID_EM2874) {
                /* Digital only device - don't load any alsa module */
                dev->audio_mode.has_audio = 0;
                dev->has_audio_class = 0;