diff options
author | Rene Herman <rene.herman@gmail.com> | 2008-08-03 23:26:26 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-08-06 09:40:05 -0400 |
commit | a0d9274cd888ada59fe2734f45019d84bc40ac3d (patch) | |
tree | 4b1692abda306c6e071b429a63b7c5a5decfdf68 /sound/isa/opti9xx | |
parent | 31eca307fd9b1eb9ec138eb01bcfed16af60dabb (diff) |
ALSA: wss_lib: opti92x-ad1848 WSS_HW_DETECT fix
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>
Diffstat (limited to 'sound/isa/opti9xx')
-rw-r--r-- | sound/isa/opti9xx/opti92x-ad1848.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c index cb5f66bde5d3..19706b0d8497 100644 --- a/sound/isa/opti9xx/opti92x-ad1848.c +++ b/sound/isa/opti9xx/opti92x-ad1848.c | |||
@@ -719,6 +719,8 @@ static int __devinit snd_opti9xx_probe(struct snd_card *card) | |||
719 | chip->dma1 = dma1; | 719 | chip->dma1 = dma1; |
720 | #if defined(CS4231) || defined(OPTi93X) | 720 | #if defined(CS4231) || defined(OPTi93X) |
721 | chip->dma2 = dma2; | 721 | chip->dma2 = dma2; |
722 | #else | ||
723 | chip->dma2 = -1; | ||
722 | #endif | 724 | #endif |
723 | 725 | ||
724 | if (chip->wss_base == SNDRV_AUTO_PORT) { | 726 | if (chip->wss_base == SNDRV_AUTO_PORT) { |
@@ -734,10 +736,10 @@ static int __devinit snd_opti9xx_probe(struct snd_card *card) | |||
734 | 736 | ||
735 | error = snd_wss_create(card, chip->wss_base + 4, -1, | 737 | error = snd_wss_create(card, chip->wss_base + 4, -1, |
736 | chip->irq, chip->dma1, chip->dma2, | 738 | chip->irq, chip->dma1, chip->dma2, |
737 | #ifdef CS4231 | 739 | #ifdef OPTi93X |
738 | WSS_HW_DETECT, 0, | ||
739 | #else /* OPTi93x */ | ||
740 | WSS_HW_OPTI93X, WSS_HWSHARE_IRQ, | 740 | WSS_HW_OPTI93X, WSS_HWSHARE_IRQ, |
741 | #else | ||
742 | WSS_HW_DETECT, 0, | ||
741 | #endif | 743 | #endif |
742 | &codec); | 744 | &codec); |
743 | if (error < 0) | 745 | if (error < 0) |