diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-10-26 23:51:43 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-10-26 23:51:43 +0200 |
| commit | d22665702226e9c40bc331098559e3d55e7cd43d (patch) | |
| tree | 6e92734c9835dc9e064b20182624939f3486d28d /sound/pci/azt3328.c | |
| parent | ALSA: hda - Fix pin-config for ASUS W90V (diff) | |
| parent | ALSA: Update the sound git tree URL (diff) | |
| download | linux-d22665702226e9c40bc331098559e3d55e7cd43d.tar.xz linux-d22665702226e9c40bc331098559e3d55e7cd43d.zip | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/azt3328.c')
| -rw-r--r-- | sound/pci/azt3328.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c index 579fc0dce128..d24fe425e87f 100644 --- a/sound/pci/azt3328.c +++ b/sound/pci/azt3328.c @@ -2652,8 +2652,9 @@ snd_azf3328_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) since our hardware ought to be similar, thus use same ID. */ err = snd_mpu401_uart_new( card, 0, - MPU401_HW_AZT2320, chip->mpu_io, MPU401_INFO_INTEGRATED, - pci->irq, 0, &chip->rmidi + MPU401_HW_AZT2320, chip->mpu_io, + MPU401_INFO_INTEGRATED | MPU401_INFO_IRQ_HOOK, + -1, &chip->rmidi ); if (err < 0) { snd_printk(KERN_ERR "azf3328: no MPU-401 device at 0x%lx?\n", |