diff options
| author | Krzysztof Helt <krzysztof.h1@wp.pl> | 2008-07-31 21:09:32 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2008-08-06 15:39:56 +0200 |
| commit | ead893c0deeec165524cc8a06e7e739d7d84b4c4 (patch) | |
| tree | 86881775a9f4e7052eded95747fd8854d043fdda /sound/isa/opti9xx | |
| parent | ALSA: wss_lib: use wss mixer code instead of ad1848 one (diff) | |
| download | linux-ead893c0deeec165524cc8a06e7e739d7d84b4c4.tar.xz linux-ead893c0deeec165524cc8a06e7e739d7d84b4c4.zip | |
ALSA: wss_lib: use wss pcm code instead of ad1848 one
Use the wss pcm code and kill the ad1848 pcm code.
The AD1848 chip is much slower than CS4231 chips
so the waiting loop was increased 100x (10x is not
enough).
Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Reviewed-by: Rene Herman <rene.herman@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/isa/opti9xx')
| -rw-r--r-- | sound/isa/opti9xx/opti92x-ad1848.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c index 4f172a219244..561d4b3ed098 100644 --- a/sound/isa/opti9xx/opti92x-ad1848.c +++ b/sound/isa/opti9xx/opti92x-ad1848.c @@ -754,18 +754,15 @@ static int __devinit snd_opti9xx_probe(struct snd_card *card) #ifdef OPTi93X chip->codec = codec; #endif - error = snd_wss_pcm(codec, 0, &pcm); - if (error < 0) - return error; #else error = snd_ad1848_create(card, chip->wss_base + 4, chip->irq, chip->dma1, WSS_HW_DETECT, &codec); if (error < 0) return error; - error = snd_ad1848_pcm(codec, 0, &pcm); +#endif + error = snd_wss_pcm(codec, 0, &pcm); if (error < 0) return error; -#endif error = snd_wss_mixer(codec); if (error < 0) return error; |