summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kerrison <steve@stevekerrison.com>2011-05-02 18:19:14 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-05-20 09:30:15 -0300
commit2892bd0d95f8b0312db6f630e3a79eefb6981fcb (patch)
treebf215d6bde3f9be1bb3d71bb085905bd7a9ee04d
parent9ac51c5e53d6b16c9a3fa541117cf96dedd6b3dd (diff)
downloadtalos-obmc-linux-2892bd0d95f8b0312db6f630e3a79eefb6981fcb.tar.gz
talos-obmc-linux-2892bd0d95f8b0312db6f630e3a79eefb6981fcb.zip
[media] em28xx: Disable audio for EM28174
Signed-off-by: Steve Kerrison <steve@stevekerrison.com> Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/em28xx/em28xx-core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
index 92b6dd84f1f6..e33f145d867a 100644
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/drivers/media/video/em28xx/em28xx-core.c
@@ -489,7 +489,8 @@ int em28xx_audio_setup(struct em28xx *dev)
int vid1, vid2, feat, cfg;
u32 vid;
- if (dev->chip_id == CHIP_ID_EM2870 || dev->chip_id == CHIP_ID_EM2874) {
+ if (dev->chip_id == CHIP_ID_EM2870 || dev->chip_id == CHIP_ID_EM2874
+ || dev->chip_id == CHIP_ID_EM28174) {
/* Digital only device - don't load any alsa module */
dev->audio_mode.has_audio = 0;
dev->has_audio_class = 0;
OpenPOWER on IntegriCloud