From 71dbc8bb8285c70ca263192b8a7d14ea592e526b Mon Sep 17 00:00:00 2001 From: Steve Kerrison Date: Mon, 2 May 2011 18:19:14 -0300 Subject: [PATCH] --- yaml --- r: 250257 b: refs/heads/master c: 2892bd0d95f8b0312db6f630e3a79eefb6981fcb h: refs/heads/master i: 250255: b685c43ce92951774dbd3485c148d6abecb1f2ac v: v3 --- [refs] | 2 +- trunk/drivers/media/video/em28xx/em28xx-core.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 71323bf840c9..38dd5e67014b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ac51c5e53d6b16c9a3fa541117cf96dedd6b3dd +refs/heads/master: 2892bd0d95f8b0312db6f630e3a79eefb6981fcb diff --git a/trunk/drivers/media/video/em28xx/em28xx-core.c b/trunk/drivers/media/video/em28xx/em28xx-core.c index 92b6dd84f1f6..e33f145d867a 100644 --- a/trunk/drivers/media/video/em28xx/em28xx-core.c +++ b/trunk/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;