From: Devin Heitmueller Date: Tue, 30 Dec 2008 01:43:55 +0000 (-0300) Subject: V4L/DVB (10122): em28xx: don't load em28xx-alsa for em2870 based devices X-Git-Tag: v2.6.29-rc1~556^2~7 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=62f3e69bd5ff9db1574356a84895324ab3896e44;p=linux-2.6-omap-h63xx.git V4L/DVB (10122): em28xx: don't load em28xx-alsa for em2870 based devices 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 Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c index ac735f25283..5d1482280e4 100644 --- a/drivers/media/video/em28xx/em28xx-core.c +++ b/drivers/media/video/em28xx/em28xx-core.c @@ -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;