From a6e9069a3f4bdef6824e4ca0911e6b443a22ad95 Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Mon, 27 Mar 2006 01:17:10 -0800
Subject: [PATCH] --- yaml --- r: 24354 b: refs/heads/master c:
 db2735eb9076c5176ec9dcbbaefd38e7d82f0e47 h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/sound/isa/azt2320.c | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index ab584e06fd39..5e483d4dbbc9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51427ec0f222cb73b21f3849416a95d751bdd742
+refs/heads/master: db2735eb9076c5176ec9dcbbaefd38e7d82f0e47
diff --git a/trunk/sound/isa/azt2320.c b/trunk/sound/isa/azt2320.c
index a530691bf4f7..15e59283aac6 100644
--- a/trunk/sound/isa/azt2320.c
+++ b/trunk/sound/isa/azt2320.c
@@ -310,6 +310,8 @@ 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)
 {
@@ -323,6 +325,7 @@ static int __devinit snd_azt2320_pnp_detect(struct pnp_card_link *card,
 		if (res < 0)
 			return res;
 		dev++;
+		azt2320_devices++;
 		return 0;
 	}
         return -ENODEV;
@@ -372,10 +375,13 @@ static struct pnp_card_driver azt2320_pnpc_driver = {
 
 static int __init alsa_card_azt2320_init(void)
 {
-	int cards;
+	int err;
+
+	err = pnp_register_card_driver(&azt2320_pnpc_driver);
+	if (err)
+		return err;
 
-	cards = pnp_register_card_driver(&azt2320_pnpc_driver);
-	if (cards <= 0) {
+	if (!azt2320_devices) {
 		pnp_unregister_card_driver(&azt2320_pnpc_driver);
 #ifdef MODULE
 		snd_printk(KERN_ERR "no AZT2320 based soundcards found\n");