From f56b5a6b81a6390654d7523ef477b981671e48da Mon Sep 17 00:00:00 2001 From: Ondrej Zary Date: Tue, 7 Jul 2009 18:09:48 +0200 Subject: [PATCH] --- yaml --- r: 157745 b: refs/heads/master c: 72b43cf1402169e8bc088838a6db91d613c35627 h: refs/heads/master i: 157743: 0160d7a5bdb1e0bf1c2c84d534d23c2cde9027d3 v: v3 --- [refs] | 2 +- trunk/sound/isa/cmi8330.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 9ea988a94ed3..4364ce684d74 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b959167237208bc1a811e30bf866cd29bff1652 +refs/heads/master: 72b43cf1402169e8bc088838a6db91d613c35627 diff --git a/trunk/sound/isa/cmi8330.c b/trunk/sound/isa/cmi8330.c index f7acb8dac185..02f79d252718 100644 --- a/trunk/sound/isa/cmi8330.c +++ b/trunk/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