summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
diff options
context:
space:
mode:
authorDevin Heitmueller <dheitmueller@linuxtv.org>2008-12-29 20:43:55 -0500
committerDevin Heitmueller <dheitmueller@linuxtv.org>2008-12-29 20:43:55 -0500
commit93f9869a5b7ed2fd7ad99619b99212fc8d352f47 (patch)
tree8552a6bc29bcfbdd6c1771c463a82ade3ae43907 /linux/drivers/media/video
parent86a622ea545a87c684120263bce4b44449952550 (diff)
downloadmediapointer-dvb-s2-93f9869a5b7ed2fd7ad99619b99212fc8d352f47.tar.gz
mediapointer-dvb-s2-93f9869a5b7ed2fd7ad99619b99212fc8d352f47.tar.bz2
em28xx: don't load em28xx-alsa for em2870 based devices
From: Devin Heitmueller <dheitmueller@linuxtv.org> Like the em2874, the em2870 does not have any analog support, so don't bother loading the em28xx-alsa module. Priority: normal Signed-off-by: Devin Heitmueller <dheitmueller@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/video')
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-core.c b/linux/drivers/media/video/em28xx/em28xx-core.c
index 1183519eb..156ebe677 100644
--- a/linux/drivers/media/video/em28xx/em28xx-core.c
+++ b/linux/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;