From bb838c8f6485fdfdbda966fe60cc481c7f48af3f Mon Sep 17 00:00:00 2001
From: Rask Ingemann Lambertsen <rask@sygehus.dk>
Date: Mon, 19 Mar 2007 11:38:11 +0100
Subject: [PATCH] --- yaml --- r: 56132 b: refs/heads/master c:
 2944275b146f4c0bb229a862bd8b3930c157d2a1 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/sound/isa/ad1816a/ad1816a.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9f6e8f2acb27..f4f754b481a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b60f6b0904737cb76cd4cd46b57592318c9a20e
+refs/heads/master: 2944275b146f4c0bb229a862bd8b3930c157d2a1
diff --git a/trunk/sound/isa/ad1816a/ad1816a.c b/trunk/sound/isa/ad1816a/ad1816a.c
index 59034507175b..fc88a31da6f5 100644
--- a/trunk/sound/isa/ad1816a/ad1816a.c
+++ b/trunk/sound/isa/ad1816a/ad1816a.c
@@ -129,8 +129,8 @@ static int __devinit snd_card_ad1816a_pnp(int dev, struct snd_card_ad1816a *acar
 	}
 	acard->devmpu = pnp_request_card_device(card, id->devs[1].id, NULL);
 	if (acard->devmpu == NULL) {
-		kfree(cfg);
-		return -EBUSY;
+		mpu_port[dev] = -1;
+		snd_printk(KERN_WARNING PFX "MPU401 device busy, skipping.\n");
 	}
 
 	pdev = acard->dev;
@@ -162,6 +162,10 @@ static int __devinit snd_card_ad1816a_pnp(int dev, struct snd_card_ad1816a *acar
 	dma2[dev] = pnp_dma(pdev, 1);
 	irq[dev] = pnp_irq(pdev, 0);
 
+	if (acard->devmpu == NULL) {
+		kfree(cfg);
+		return 0;
+	}
 	pdev = acard->devmpu;
 	pnp_init_resource_table(cfg);