[ALSA] ad1816a: Fix modprobe snd_mpu401 && modprobe snd_ad1816a

[linux-2.6-omap-h63xx.git] / sound / isa / ad1816a / ad1816a.c

diff --git a/sound/isa/ad1816a/ad1816a.c b/sound/isa/ad1816a/ad1816a.c
index 59034507175b617b331c1dad07028344813e8f57..fc88a31da6f51a6730d75e6c2cd2e058ac5d1781 100644 (file)
--- a/sound/isa/ad1816a/ad1816a.c
+++ b/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);