diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2010-05-10 09:48:47 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-05-10 09:48:47 +0200 |
| commit | 02a2ad40295fc8862457b469b3b698d8ece3c72a (patch) | |
| tree | c17cda3d6cd13f2315cf886ff5a890fdab068645 /sound/isa | |
| parent | ALSA: maestro3: Clear interrupts before enabling them (diff) | |
| parent | ALSA: take tu->qlock with irqs disabled (diff) | |
| download | linux-dev-02a2ad40295fc8862457b469b3b698d8ece3c72a.tar.xz linux-dev-02a2ad40295fc8862457b469b3b698d8ece3c72a.zip | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/isa')
| -rw-r--r-- | sound/isa/sb/es968.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/isa/sb/es968.c b/sound/isa/sb/es968.c index cafc3a7316a8..ff18286fef9d 100644 --- a/sound/isa/sb/es968.c +++ b/sound/isa/sb/es968.c @@ -93,7 +93,7 @@ static int __devinit snd_card_es968_pnp(int dev, struct snd_card_es968 *acard, return err; } port[dev] = pnp_port_start(pdev, 0); - dma8[dev] = pnp_dma(pdev, 1); + dma8[dev] = pnp_dma(pdev, 0); irq[dev] = pnp_irq(pdev, 0); return 0; |