fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/sound/isa/ad1816a/ad1816a.c b/sound/isa/ad1816a/ad1816a.c
index 7051f77..5903450 100644 (file)
--- a/sound/isa/ad1816a/ad1816a.c
+++ b/sound/isa/ad1816a/ad1816a.c
@@ -120,6 +120,8 @@ static int __devinit snd_card_ad1816a_pnp(int dev, struct snd_card_ad1816a *acar
        struct pnp_resource_table *cfg = kmalloc(sizeof(*cfg), GFP_KERNEL);
        int err;
 
+       if (!cfg)
+               return -ENOMEM;
        acard->dev = pnp_request_card_device(card, id->devs[0].id, NULL);
        if (acard->dev == NULL) {
                kfree(cfg);
@@ -232,7 +234,7 @@ static int __devinit snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard
 
        if (mpu_port[dev] > 0) {
                if (snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
-                                       mpu_port[dev], 0, mpu_irq[dev], SA_INTERRUPT,
+                                       mpu_port[dev], 0, mpu_irq[dev], IRQF_DISABLED,
                                        NULL) < 0)
                        printk(KERN_ERR PFX "no MPU-401 device at 0x%lx.\n", mpu_port[dev]);
        }
@@ -262,6 +264,8 @@ static int __devinit snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard
        return 0;
 }
 
+static unsigned int __devinitdata ad1816a_devices;
+
 static int __devinit snd_ad1816a_pnp_detect(struct pnp_card_link *card,
                                            const struct pnp_card_device_id *id)
 {
@@ -275,6 +279,7 @@ static int __devinit snd_ad1816a_pnp_detect(struct pnp_card_link *card,
                if (res < 0)
                        return res;
                dev++;
+               ad1816a_devices++;
                return 0;
        }
         return -ENODEV;
@@ -297,10 +302,13 @@ static struct pnp_card_driver ad1816a_pnpc_driver = {
 
 static int __init alsa_card_ad1816a_init(void)
 {
-       int cards;
+       int err;
+
+       err = pnp_register_card_driver(&ad1816a_pnpc_driver);
+       if (err)
+               return err;
 
-       cards = pnp_register_card_driver(&ad1816a_pnpc_driver);
-       if (cards <= 0) {
+       if (!ad1816a_devices) {
                pnp_unregister_card_driver(&ad1816a_pnpc_driver);
 #ifdef MODULE
                printk(KERN_ERR "no AD1816A based soundcards found.\n");