diff options
| author |   Devin Heitmueller <dheitmueller@linuxtv.org> | 2008-12-30 00:17:09 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 09:40:38 -0200 |
| commit | de84830e6959b046a99da3be12246458f4ab9825 (patch) | |
| tree | d10e381d00711b066220c1968799d54f4d5c085f /drivers/media/video/em28xx/em28xx-core.c | |
| parent | V4L/DVB (10124): em28xx: expand output formats available (diff) | |
| download | linux-dev-de84830e6959b046a99da3be12246458f4ab9825.tar.xz linux-dev-de84830e6959b046a99da3be12246458f4ab9825.zip | |
V4L/DVB (10125): em28xx: Don't do AC97 vendor detection for i2s audio devices
The current code was trying to query the AC97 registers for the vendor
information even if it was clearly not a AC97 audio device (resulting in errors
in the dmesg output). This was due to a bug in the way we did the check.
Signed-off-by: Devin Heitmueller <dheitmueller@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/media/video/em28xx/em28xx-core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c index 5d1482280e45..f8504518586a 100644 --- a/drivers/media/video/em28xx/em28xx-core.c +++ b/drivers/media/video/em28xx/em28xx-core.c @@ -497,7 +497,8 @@ int em28xx_audio_setup(struct em28xx *dev) dev->audio_mode.i2s_5rates = 1; } - if (!(cfg & EM28XX_CHIPCFG_AC97)) { + if ((cfg & EM28XX_CHIPCFG_AUDIOMASK) != EM28XX_CHIPCFG_AC97) { + /* Skip the code that does AC97 vendor detection */ dev->audio_mode.ac97 = EM28XX_NO_AC97; goto init_audio; } |