Skip to content

Commit

Permalink
ALSA: cmi8330: Allow MPU-401-less operation
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ondrej Zary authored and Takashi Iwai committed Jul 7, 2009
1 parent 0b95916 commit 72b43cf
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions sound/isa/cmi8330.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 72b43cf

Please sign in to comment.