summaryrefslogtreecommitdiff
path: root/sound/isa
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-05-10 11:48:47 +0400
committerTakashi Iwai <tiwai@suse.de>2010-05-10 11:48:47 +0400
commit02a2ad40295fc8862457b469b3b698d8ece3c72a (patch)
treec17cda3d6cd13f2315cf886ff5a890fdab068645 /sound/isa
parent1bde78bc25a8e244006f63adb851bfb34407d48c (diff)
parentbfe70783ca8e61f1fc3588cd59c4f1b755e9d3cf (diff)
downloadlinux-02a2ad40295fc8862457b469b3b698d8ece3c72a.tar.xz
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/isa')
-rw-r--r--sound/isa/sb/es968.c2
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;