linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/sound/isa/dt019x.c b/sound/isa/dt019x.c
index c20a4b1..50e7bc5 100644 (file)
--- a/sound/isa/dt019x.c
+++ b/sound/isa/dt019x.c
@@ -240,7 +240,7 @@ static int __devinit snd_card_dt019x_probe(int dev, struct pnp_card_link *pcard,
                                        MPU401_HW_MPU401,
                                        mpu_port[dev], 0,
                                        mpu_irq[dev],
-                                       mpu_irq[dev] >= 0 ? IRQF_DISABLED : 0,
+                                       mpu_irq[dev] >= 0 ? SA_INTERRUPT : 0,
                                        NULL) < 0)
                        snd_printk(KERN_ERR PFX "no MPU-401 device at 0x%lx ?\n", mpu_port[dev]);
        }
@@ -272,8 +272,6 @@ static int __devinit snd_card_dt019x_probe(int dev, struct pnp_card_link *pcard,
        return 0;
 }
 
-static unsigned int __devinitdata dt019x_devices;
-
 static int __devinit snd_dt019x_pnp_probe(struct pnp_card_link *card,
                                          const struct pnp_card_device_id *pid)
 {
@@ -287,7 +285,6 @@ static int __devinit snd_dt019x_pnp_probe(struct pnp_card_link *card,
                if (res < 0)
                        return res;
                dev++;
-               dt019x_devices++;
                return 0;
        }
        return -ENODEV;
@@ -339,13 +336,10 @@ static struct pnp_card_driver dt019x_pnpc_driver = {
 
 static int __init alsa_card_dt019x_init(void)
 {
-       int err;
-
-       err = pnp_register_card_driver(&dt019x_pnpc_driver);
-       if (err)
-               return err;
+       int cards = 0;
 
-       if (!dt019x_devices) {
+       cards = pnp_register_card_driver(&dt019x_pnpc_driver);
+       if (cards <= 0) {
                pnp_unregister_card_driver(&dt019x_pnpc_driver);
 #ifdef MODULE
                snd_printk(KERN_ERR "no DT-019X / ALS-007 based soundcards found\n");