ALSA CVS update

D:2003/09/23 15:17:21
C:CS4236+ driver,PC98(CS423x) driver
A:Takashi Iwai <tiwai@suse.de>
F:isa/cs423x/cs4236.c:1.35->1.36
F:isa/cs423x/pc98.c:1.4->1.5
L:fixes by Uros Bizjak <uros@kss-loka.si>:
L:
L:- fixed the wrong DMA channel check in card->longname string
L:  composition.

diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c
index 31786001367e78e9dd82a87854acceb0d3d936ca..6a85c98c540552855763be7ed5a7b46e329a4ddf 100644 (file)
--- a/sound/isa/cs423x/cs4236.c
+++ b/sound/isa/cs423x/cs4236.c
@@ -525,7 +525,7 @@ static int __devinit snd_card_cs423x_probe(int dev, struct pnp_card_link *pcard,
                chip->port,
                irq[dev],
                dma1[dev]);
-       if (dma1[dev] >= 0)
+       if (dma2[dev] >= 0)
                sprintf(card->longname + strlen(card->longname), "&%d", dma2[dev]);
        if ((err = snd_card_register(card)) < 0) {
                snd_card_free(card);

diff --git a/sound/isa/cs423x/pc98.c b/sound/isa/cs423x/pc98.c
index ae627f74aad6ab98ee92006de9d72092d81f163b..0d7787bc47670c7b56aedf69a0f4f8a555e6f3ac 100644 (file)
--- a/sound/isa/cs423x/pc98.c
+++ b/sound/isa/cs423x/pc98.c
@@ -400,7 +400,7 @@ static int __init snd_card_pc98_probe(int dev)
                chip->port,
                irq[dev],
                dma1[dev]);
-       if (dma1[dev] >= 0)
+       if (dma2[dev] >= 0)
                sprintf(card->longname + strlen(card->longname), "&%d", dma2[dev]);
        if ((err = snd_card_register(card)) < 0) {
                snd_card_free(card);