summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOndrej Zary <linux@rainbow-software.org>2009-07-07 18:09:48 +0200
committerTakashi Iwai <tiwai@suse.de>2009-07-07 18:24:53 +0200
commit72b43cf1402169e8bc088838a6db91d613c35627 (patch)
tree20b2ee598974bd6bd82d0635780c18b631e2bc2f
parent0b959167237208bc1a811e30bf866cd29bff1652 (diff)
downloadlinux-3.10-72b43cf1402169e8bc088838a6db91d613c35627.tar.gz
linux-3.10-72b43cf1402169e8bc088838a6db91d613c35627.tar.bz2
linux-3.10-72b43cf1402169e8bc088838a6db91d613c35627.zip
ALSA: cmi8330: Allow MPU-401-less operation
Adding MPU-401 support to cmi8330 driver could cause a regression (non-working sound) on a system where there is no free IRQ for the MPU-401 device (which is not very uncommon as this card requires two separate IRQs plus a third one for MPU-401). When MPU-401 PnP configuration fails (mostly because of unavailable IRQ), just ignore MPU-401 and continue without it. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/isa/cmi8330.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c
index f7acb8dac18..02f79d25271 100644
--- a/sound/isa/cmi8330.c
+++ b/sound/isa/cmi8330.c
@@ -389,12 +389,12 @@ static int __devinit snd_cmi8330_pnp(int dev, struct snd_cmi8330 *acard,
pdev = acard->mpu;
err = pnp_activate_dev(pdev);
- if (err < 0) {
- snd_printk(KERN_ERR "MPU-401 PnP configure failure\n");
- return -EBUSY;
+ if (err < 0)
+ snd_printk(KERN_ERR "MPU-401 PnP configure failure: will be disabled\n");
+ else {
+ mpuport[dev] = pnp_port_start(pdev, 0);
+ mpuirq[dev] = pnp_irq(pdev, 0);
}
- mpuport[dev] = pnp_port_start(pdev, 0);
- mpuirq[dev] = pnp_irq(pdev, 0);
return 0;
}
#endif