---

yaml --- r: 124583 b: refs/heads/master c: 62f3e69 h: refs/heads/master i: 124581: 27cabd3 124579: 6224375 124575: 39f749b v: v3
git-mirror · Dec 30, 2008 · acbd37c · acbd37c
1 parent dd05001
commit acbd37c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ed3a7a3113a5399a4591fdf1f2a07c9cd954853
+refs/heads/master: 62f3e69bd5ff9db1574356a84895324ab3896e44
diff --git a/trunk/drivers/media/video/em28xx/em28xx-core.c b/trunk/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;