Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

[sfrench/cifs-2.6.git] / sound / isa / dt019x.c

diff --git a/sound/isa/dt019x.c b/sound/isa/dt019x.c
index 50e7bc5ef561edfb89efd8f33f8b29b868b45c3e..ce57d526f7bc3e5b8fc6608c83d97ff248a99f71 100644 (file)
--- a/sound/isa/dt019x.c
+++ b/sound/isa/dt019x.c
@@ -23,7 +23,6 @@
 
 #include <sound/driver.h>
 #include <linux/init.h>
-#include <linux/sched.h>
 #include <linux/wait.h>
 #include <linux/pnp.h>
 #include <linux/moduleparam.h>
@@ -240,7 +239,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 ? SA_INTERRUPT : 0,
+                                       mpu_irq[dev] >= 0 ? IRQF_DISABLED : 0,
                                        NULL) < 0)
                        snd_printk(KERN_ERR PFX "no MPU-401 device at 0x%lx ?\n", mpu_port[dev]);
        }
@@ -272,6 +271,8 @@ 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)
 {
@@ -285,6 +286,7 @@ static int __devinit snd_dt019x_pnp_probe(struct pnp_card_link *card,
                if (res < 0)
                        return res;
                dev++;
+               dt019x_devices++;
                return 0;
        }
        return -ENODEV;
@@ -336,10 +338,13 @@ static struct pnp_card_driver dt019x_pnpc_driver = {
 
 static int __init alsa_card_dt019x_init(void)
 {
-       int cards = 0;
+       int err;
+
+       err = pnp_register_card_driver(&dt019x_pnpc_driver);
+       if (err)
+               return err;
 
-       cards = pnp_register_card_driver(&dt019x_pnpc_driver);
-       if (cards <= 0) {
+       if (!dt019x_devices) {
                pnp_unregister_card_driver(&dt019x_pnpc_driver);
 #ifdef MODULE
                snd_printk(KERN_ERR "no DT-019X / ALS-007 based soundcards found\n");