---

yaml --- r: 157745 b: refs/heads/master c: 72b43cf h: refs/heads/master i: 157743: 0160d7a v: v3
git-mirror · Jul 7, 2009 · f56b5a6 · f56b5a6
1 parent 78ec17c
commit f56b5a6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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