fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / sound / isa / sb / es968.c

diff --git a/sound/isa/sb/es968.c b/sound/isa/sb/es968.c
index 9da80bf..d4b2187 100644 (file)
--- a/sound/isa/sb/es968.c
+++ b/sound/isa/sb/es968.c
@@ -70,8 +70,7 @@ MODULE_DEVICE_TABLE(pnp_card, snd_es968_pnpids);
 
 #define        DRIVER_NAME     "snd-card-es968"
 
-static irqreturn_t snd_card_es968_interrupt(int irq, void *dev_id,
-                                           struct pt_regs *regs)
+static irqreturn_t snd_card_es968_interrupt(int irq, void *dev_id)
 {
        struct snd_sb *chip = dev_id;
 
@@ -124,7 +123,7 @@ static int __devinit snd_card_es968_pnp(int dev, struct snd_card_es968 *acard,
        return 0;
 }
 
-static int __init snd_card_es968_probe(int dev,
+static int __devinit snd_card_es968_probe(int dev,
                                        struct pnp_card_link *pcard,
                                        const struct pnp_card_device_id *pid)
 {
@@ -182,6 +181,8 @@ static int __init snd_card_es968_probe(int dev,
        return 0;
 }
 
+static unsigned int __devinitdata es968_devices;
+
 static int __devinit snd_es968_pnp_detect(struct pnp_card_link *card,
                                           const struct pnp_card_device_id *id)
 {
@@ -195,6 +196,7 @@ static int __devinit snd_es968_pnp_detect(struct pnp_card_link *card,
                if (res < 0)
                        return res;
                dev++;
+               es968_devices++;
                return 0;
        }
        return -ENODEV;
@@ -246,8 +248,11 @@ static struct pnp_card_driver es968_pnpc_driver = {
 
 static int __init alsa_card_es968_init(void)
 {
-       int cards = pnp_register_card_driver(&es968_pnpc_driver);
-       if (cards <= 0) {
+       int err = pnp_register_card_driver(&es968_pnpc_driver);
+       if (err)
+               return err;
+
+       if (!es968_devices) {
                pnp_unregister_card_driver(&es968_pnpc_driver);
 #ifdef MODULE
                snd_printk(KERN_ERR "no ES968 based soundcards found\n");