mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-22 17:01:14 +00:00
Code Issues Releases Wiki Activity

ALSA: wss_lib: opti92x-ad1848 WSS_HW_DETECT fix

Browse source 
snd-opti92x-ad1848 mistakingly passes WSS_HW_OPTI93X currently. This
fixes it as tested with a OPTi 82C929A/AD1848 card.

Signed-off-by: Rene Herman <rene.herman@gmail.com>
Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Rene Herman 2008-08-04 05:26:26 +02:00 committed by Jaroslav Kysela
parent 31eca307fd
commit a0d9274cd8
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sound/isa/opti9xx/opti92x-ad1848.c
View file

@ -719,6 +719,8 @@ static int __devinit snd_opti9xx_probe(struct snd_card *card)
chip->dma1 = dma1; chip->dma1 = dma1;
#if defined(CS4231) || defined(OPTi93X) #if defined(CS4231) || defined(OPTi93X)
chip->dma2 = dma2; chip->dma2 = dma2;
#else
chip->dma2 = -1;
#endif #endif
if (chip->wss_base == SNDRV_AUTO_PORT) { if (chip->wss_base == SNDRV_AUTO_PORT) {
@ -734,10 +736,10 @@ static int __devinit snd_opti9xx_probe(struct snd_card *card)
error = snd_wss_create(card, chip->wss_base + 4, -1, error = snd_wss_create(card, chip->wss_base + 4, -1,
chip->irq, chip->dma1, chip->dma2, chip->irq, chip->dma1, chip->dma2,
#ifdef CS4231 #ifdef OPTi93X
WSS_HW_DETECT, 0,
#else /* OPTi93x */
WSS_HW_OPTI93X, WSS_HWSHARE_IRQ, WSS_HW_OPTI93X, WSS_HWSHARE_IRQ,
#else
WSS_HW_DETECT, 0,
#endif #endif
&codec); &codec);
if (error < 0) if (error < 0)