cmi8330: Allow MPU-401-less operation
PATCH 1/1 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.
--- linux-test/sound/isa/cmi8330.c 2009-07-06 22:39:24.000000000 +0200
+++ linux-2.6.30-pentium/sound/isa/cmi8330.c 2009-07-06 22:39:09.000000000
+0200
@@ -389,12 +389,12 @@
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
Signature · 1 line
Ondrej Zary
At Tue, 7 Jul 2009 18:09:48 +0200,
Quoted 11 lines · Ondrej Zary
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 <[email protected]>
Applied now. Thanks.
Takashi
Quoted 31 lines
sound/isa/cmi8330.c +6
-5+0200 @@ -389,12 +389,12 @@ 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 Signature · 6 lines
-- Ondrej Zary _______________________________________________ Alsa-devel mailing list [email protected] http://mailman.alsa-project.org/mailman/listinfo/alsa-devel