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

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

diff --git a/[refs] b/[refs]
index 14013be498cb..01f196acb7fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fea9739f2a1aed1cfb9b7af7cce66b28b68d4394
+refs/heads/master: 6a3a3a0260cf5a4e5942db8d56cae4db4dc139a6
diff --git a/trunk/sound/isa/sb/es968.c b/trunk/sound/isa/sb/es968.c
index 9da80bfa3027..d4d65b84265a 100644
--- a/trunk/sound/isa/sb/es968.c
+++ b/trunk/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 __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 +182,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 +197,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 +249,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");