diff options
| author | Devin Heitmueller <dheitmueller@linuxtv.org> | 2008-12-29 22:17:09 -0500 |
|---|---|---|
| committer | Devin Heitmueller <dheitmueller@linuxtv.org> | 2008-12-29 22:17:09 -0500 |
| commit | 9432f298ddeb3d9fd4fa7904e6ec802962e002ff (patch) | |
| tree | 900b9610084b2a88d46dc328e69e847dca69df6e /linux | |
| parent | 87fe61efe9940db733854a3b4f80401de8eec3fb (diff) | |
| download | mediapointer-dvb-s2-9432f298ddeb3d9fd4fa7904e6ec802962e002ff.tar.gz mediapointer-dvb-s2-9432f298ddeb3d9fd4fa7904e6ec802962e002ff.tar.bz2 | |
em28xx: Don't do AC97 vendor detection for i2s audio devices
From: Devin Heitmueller <dheitmueller@linuxtv.org>
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.
Priority: normal
Signed-off-by: Devin Heitmueller <dheitmueller@linuxtv.org>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-core.c b/linux/drivers/media/video/em28xx/em28xx-core.c index 156ebe677..65bc5c8a9 100644 --- a/linux/drivers/media/video/em28xx/em28xx-core.c +++ b/linux/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; } |