X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sound%2Fisa%2Fazt2320.c;h=a530691bf4f7232acb9e5fb6c0a2e12953591ab3;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=15e59283aac6784771490d5fd53d212485124e4d;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/sound/isa/azt2320.c b/sound/isa/azt2320.c
index 15e59283a..a530691bf 100644
--- a/sound/isa/azt2320.c
+++ b/sound/isa/azt2320.c
@@ -310,8 +310,6 @@ static int __devinit snd_card_azt2320_probe(int dev,
 	return 0;
 }
 
-static unsigned int __devinitdata azt2320_devices;
-
 static int __devinit snd_azt2320_pnp_detect(struct pnp_card_link *card,
 					    const struct pnp_card_device_id *id)
 {
@@ -325,7 +323,6 @@ static int __devinit snd_azt2320_pnp_detect(struct pnp_card_link *card,
 		if (res < 0)
 			return res;
 		dev++;
-		azt2320_devices++;
 		return 0;
 	}
         return -ENODEV;
@@ -375,13 +372,10 @@ static struct pnp_card_driver azt2320_pnpc_driver = {
 
 static int __init alsa_card_azt2320_init(void)
 {
-	int err;
-
-	err = pnp_register_card_driver(&azt2320_pnpc_driver);
-	if (err)
-		return err;
+	int cards;
 
-	if (!azt2320_devices) {
+	cards = pnp_register_card_driver(&azt2320_pnpc_driver);
+	if (cards <= 0) {
 		pnp_unregister_card_driver(&azt2320_pnpc_driver);
 #ifdef MODULE
 		snd_printk(KERN_ERR "no AZT2320 based soundcards found\n");