From 92edf713542e76969f1190c8eba07160537eaa58 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: 24359 b: refs/heads/master c:
 ebdb71ea7b384ff3f32dd038dba0aad58580e832 h: refs/heads/master i:   24357:
 7fe6db661ed479cbf27be80eff6c13bcd1120b2e   24355:
 f1318bd8299f21709ccb32ce9f5cc9aa77d0a4e3   24351:
 08fa7ec452a119ee6fddbc0194bb6fb92d8c56db v: v3

---
 [refs]                          |  2 +-
 trunk/sound/isa/gus/interwave.c | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 01f196acb7fe..47225ff121dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a3a3a0260cf5a4e5942db8d56cae4db4dc139a6
+refs/heads/master: ebdb71ea7b384ff3f32dd038dba0aad58580e832
diff --git a/trunk/sound/isa/gus/interwave.c b/trunk/sound/isa/gus/interwave.c
index 2cacd0fa6871..de71b7a99c83 100644
--- a/trunk/sound/isa/gus/interwave.c
+++ b/trunk/sound/isa/gus/interwave.c
@@ -791,7 +791,7 @@ static int __devinit snd_interwave_probe(struct snd_card *card, int dev)
 	return 0;
 }
 
-static int __init snd_interwave_nonpnp_probe1(int dev, struct platform_device *devptr)
+static int __devinit snd_interwave_nonpnp_probe1(int dev, struct platform_device *devptr)
 {
 	struct snd_card *card;
 	int err;
@@ -809,7 +809,7 @@ static int __init snd_interwave_nonpnp_probe1(int dev, struct platform_device *d
 	return 0;
 }
 
-static int __init snd_interwave_nonpnp_probe(struct platform_device *pdev)
+static int __devinit snd_interwave_nonpnp_probe(struct platform_device *pdev)
 {
 	int dev = pdev->id;
 	int err;
@@ -867,6 +867,7 @@ static struct platform_driver snd_interwave_driver = {
 };
 
 #ifdef CONFIG_PNP
+static unsigned int __devinitdata interwave_pnp_devices;
 
 static int __devinit snd_interwave_pnp_detect(struct pnp_card_link *pcard,
 					      const struct pnp_card_device_id *pid)
@@ -897,6 +898,7 @@ static int __devinit snd_interwave_pnp_detect(struct pnp_card_link *pcard,
 	}
 	pnp_set_card_drvdata(pcard, card);
 	dev++;
+	interwave_pnp_devices++;
 	return 0;
 }
 
@@ -954,10 +956,10 @@ static int __init alsa_card_interwave_init(void)
 	}
 
 	/* ISA PnP cards */
-	i = pnp_register_card_driver(&interwave_pnpc_driver);
-	if (i >= 0) {
+	err = pnp_register_card_driver(&interwave_pnpc_driver);
+	if (!err) {
 		pnp_registered = 1;
-		cards += i;
+		cards += interwave_pnp_devices;;
 	}
 
 	if (!cards) {