---

yaml --- r: 250257 b: refs/heads/master c: 2892bd0 h: refs/heads/master i: 250255: b685c43 v: v3
git-mirror · May 20, 2011 · 71dbc8b · 71dbc8b
1 parent 032bcc0
commit 71dbc8b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;