linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/sound/isa/sb/es968.c b/sound/isa/sb/es968.c
index d4d65b8..9da80bf 100644 (file)
--- a/sound/isa/sb/es968.c
+++ b/sound/isa/sb/es968.c
@@ -124,7 +124,7 @@ static int __devinit snd_card_es968_pnp(int dev, struct snd_card_es968 *acard,
        return 0;
 }
 
-static int __devinit snd_card_es968_probe(int dev,
+static int __init snd_card_es968_probe(int dev,
                                        struct pnp_card_link *pcard,
                                        const struct pnp_card_device_id *pid)
 {
@@ -182,8 +182,6 @@ static int __devinit 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)
 {
@@ -197,7 +195,6 @@ static int __devinit snd_es968_pnp_detect(struct pnp_card_link *card,
                if (res < 0)
                        return res;
                dev++;
-               es968_devices++;
                return 0;
        }
        return -ENODEV;
@@ -249,11 +246,8 @@ static struct pnp_card_driver es968_pnpc_driver = {
 
 static int __init alsa_card_es968_init(void)
 {
-       int err = pnp_register_card_driver(&es968_pnpc_driver);
-       if (err)
-               return err;
-
-       if (!es968_devices) {
+       int cards = pnp_register_card_driver(&es968_pnpc_driver);
+       if (cards <= 0) {
                pnp_unregister_card_driver(&es968_pnpc_driver);
 #ifdef MODULE
                snd_printk(KERN_ERR "no ES968 based soundcards found\n");