summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/em28xx
diff options
context:
space:
mode:
authorGareth Williams <gareth@garethwilliams.me.uk>2011-12-20 21:45:18 +0100
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-01-05 22:31:39 +0100
commit2a5fc873d6a1976b7ed47f074fc46abb9f822e32 (patch)
tree7faf4cdea676be496d7f5c147c6844b7d8a7e2fd /drivers/media/video/em28xx
parent[media] it913x add support for IT9135 9006 devices (diff)
downloadlinux-2a5fc873d6a1976b7ed47f074fc46abb9f822e32.tar.xz
linux-2a5fc873d6a1976b7ed47f074fc46abb9f822e32.zip
[media] Add AC97 8384:7650 for some versions of EMP202
Fix detection of EMP202 audio chip. Some versions have an id of 0x83847650 instead of 0xffffffff Honestech Vidbox NW03 has a EMP202 audio chip with a different Vendor ID. Apparently, it is the same with the Gadmei ITV380: http://linuxtv.org/wiki/index.php/Gadmei_USB_TVBox_UTV380 Signed-off-by: Gareth Williams <gareth@garethwilliams.me.uk> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/em28xx')
-rw-r--r--drivers/media/video/em28xx/em28xx-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
index 804a4ab47ac6..2982a061cbae 100644
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/drivers/media/video/em28xx/em28xx-core.c
@@ -568,7 +568,7 @@ int em28xx_audio_setup(struct em28xx *dev)
em28xx_warn("AC97 features = 0x%04x\n", feat);
/* Try to identify what audio processor we have */
- if ((vid == 0xffffffff) && (feat == 0x6a90))
+ if (((vid == 0xffffffff) || (vid == 0x83847650)) && (feat == 0x6a90))
dev->audio_mode.ac97 = EM28XX_AC97_EM202;
else if ((vid >> 8) == 0x838476)
dev->audio_mode.ac97 = EM28XX_AC97_SIGMATEL;