From acbd37ce4e44c22747edc8df0ea0d2b335602d66 Mon Sep 17 00:00:00 2001 From: Devin Heitmueller Date: Mon, 29 Dec 2008 22:43:55 -0300 Subject: [PATCH] --- yaml --- r: 124583 b: refs/heads/master c: 62f3e69bd5ff9db1574356a84895324ab3896e44 h: refs/heads/master i: 124581: 27cabd3034e60580cb089ba4cddf473f3e148810 124579: 6224375926aa33fe05c1daaa9d2ff3be82378a0c 124575: 39f749b5ab9460edcfa9299df784ba4d2bf26877 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/em28xx/em28xx-core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a70d55349983..e46e387c9414 100644 --- 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 index ac735f25283c..5d1482280e45 100644 --- 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;