]> err.no Git - linux-2.6/commitdiff
[ALSA] Fix adding second dma channel
authorAlexey Dobriyan <adobriyan@gmail.com>
Wed, 25 Jan 2006 13:30:44 +0000 (14:30 +0100)
committerJaroslav Kysela <perex@suse.cz>
Wed, 1 Feb 2006 12:09:26 +0000 (13:09 +0100)
Modules: OPL3SA2 driver,GUS Classic driver

dma2 is a global array. sprintf below suggests there was a typo.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/isa/gus/gusclassic.c
sound/isa/opl3sa2.c

index d1165b96fa3f3badb5b6969ee71d88336074f21c..91c219116d7a292809a225fa08ff0a4c25159c19 100644 (file)
@@ -195,7 +195,7 @@ static int __init snd_gusclassic_probe(struct platform_device *pdev)
                        goto _err;
        }
        sprintf(card->longname + strlen(card->longname), " at 0x%lx, irq %d, dma %d", gus->gf1.port, xirq, xdma1);
-       if (dma2 >= 0)
+       if (xdma2 >= 0)
                sprintf(card->longname + strlen(card->longname), "&%d", xdma2);
 
        snd_card_set_dev(card, &pdev->dev);
index 9dc6b20e9a5c07145c8d4d6470729b638e55595a..9d84319785012cb65fbdb3ddd12695404eafd983 100644 (file)
@@ -723,7 +723,7 @@ static int __devinit snd_opl3sa2_probe(struct snd_card *card, int dev)
        }
        sprintf(card->longname, "%s at 0x%lx, irq %d, dma %d",
                card->shortname, chip->port, xirq, xdma1);
-       if (dma2 >= 0)
+       if (xdma2 >= 0)
                sprintf(card->longname + strlen(card->longname), "&%d", xdma2);
 
        return snd_card_register(card);