linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/sound/isa/als100.c b/sound/isa/als100.c
index f2bcfb2..9b77c17 100644 (file)
--- a/sound/isa/als100.c
+++ b/sound/isa/als100.c
@@ -199,7 +199,7 @@ static int __devinit snd_card_als100_pnp(int dev, struct snd_card_als100 *acard,
        return 0;
 }
 
-static int __devinit snd_card_als100_probe(int dev,
+static int __init snd_card_als100_probe(int dev,
                                        struct pnp_card_link *pcard,
                                        const struct pnp_card_device_id *pid)
 {
@@ -250,7 +250,7 @@ static int __devinit snd_card_als100_probe(int dev,
        if (mpu_port[dev] > 0 && mpu_port[dev] != SNDRV_AUTO_PORT) {
                if (snd_mpu401_uart_new(card, 0, MPU401_HW_ALS100,
                                        mpu_port[dev], 0, 
-                                       mpu_irq[dev], IRQF_DISABLED,
+                                       mpu_irq[dev], SA_INTERRUPT,
                                        NULL) < 0)
                        snd_printk(KERN_ERR PFX "no MPU-401 device at 0x%lx\n", mpu_port[dev]);
        }
@@ -281,8 +281,6 @@ static int __devinit snd_card_als100_probe(int dev,
        return 0;
 }
 
-static unsigned int __devinitdata als100_devices;
-
 static int __devinit snd_als100_pnp_detect(struct pnp_card_link *card,
                                           const struct pnp_card_device_id *id)
 {
@@ -296,7 +294,6 @@ static int __devinit snd_als100_pnp_detect(struct pnp_card_link *card,
                if (res < 0)
                        return res;
                dev++;
-               als100_devices++;
                return 0;
        }
        return -ENODEV;
@@ -348,13 +345,10 @@ static struct pnp_card_driver als100_pnpc_driver = {
 
 static int __init alsa_card_als100_init(void)
 {
-       int err;
-
-       err = pnp_register_card_driver(&als100_pnpc_driver);
-       if (err)
-               return err;
+       int cards;
 
-       if (!als100_devices) {
+       cards = pnp_register_card_driver(&als100_pnpc_driver);
+       if (cards <= 0) {
                pnp_unregister_card_driver(&als100_pnpc_driver);
 #ifdef MODULE
                snd_printk(KERN_ERR "no ALS100 based soundcards found\n");