X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sound%2Fisa%2Fsb%2Fes968.c;h=9da80bfa3027ad315ad8627b6c1b6fb3e4a17402;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=d4d65b84265a8dd972d6904b65ead1be6b3b2a98;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/sound/isa/sb/es968.c b/sound/isa/sb/es968.c
index d4d65b842..9da80bfa3 100644
--- 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");