diff options
| author | Rene Herman <rene.herman@gmail.com> | 2008-08-04 05:26:26 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2008-08-06 15:40:05 +0200 |
| commit | a0d9274cd888ada59fe2734f45019d84bc40ac3d (patch) | |
| tree | 4b1692abda306c6e071b429a63b7c5a5decfdf68 /sound/isa | |
| parent | 31eca307fd9b1eb9ec138eb01bcfed16af60dabb (diff) | |
| download | linux-stable-a0d9274cd888ada59fe2734f45019d84bc40ac3d.tar.gz linux-stable-a0d9274cd888ada59fe2734f45019d84bc40ac3d.tar.bz2 linux-stable-a0d9274cd888ada59fe2734f45019d84bc40ac3d.zip | |
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')
| -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) chip->dma1 = dma1; #if defined(CS4231) || defined(OPTi93X) chip->dma2 = dma2; +#else + chip->dma2 = -1; #endif 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, chip->irq, chip->dma1, chip->dma2, -#ifdef CS4231 - WSS_HW_DETECT, 0, -#else /* OPTi93x */ +#ifdef OPTi93X WSS_HW_OPTI93X, WSS_HWSHARE_IRQ, +#else + WSS_HW_DETECT, 0, #endif &codec); if (error < 0) |