commit 62f3e69bd5ff9db1574356a84895324ab3896e44
author Devin Heitmueller <dheitmueller@linuxtv.org> Mon Dec 29 22:43:55 2008 -0300
committer Mauro Carvalho Chehab <mchehab@redhat.com> Tue Dec 30 09:40:37 2008 -0200
tree 97c55a9742decfc7c341ff815e0f7f36e25732af
parent 7ed3a7a3113a5399a4591fdf1f2a07c9cd954853

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 <dheitmueller@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

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 ac735f2..5d14822 100644
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/drivers/media/video/em28xx/em28xx-core.c
@@ -465,7 +465,7 @@
 	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;