13 files changed, 106 insertions, 66 deletions

diff --git a/sound/isa/ad1816a/ad1816a.c b/sound/isa/ad1816a/ad1816a.c
index 7051f7798ed7..31f299aed281 100644
--- a/sound/isa/ad1816a/ad1816a.c
+++ b/sound/isa/ad1816a/ad1816a.c
@@ -262,6 +262,8 @@ static int __devinit snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard
         return 0;
 }
 
+static unsigned int __devinitdata ad1816a_devices;
+
 static int __devinit snd_ad1816a_pnp_detect(struct pnp_card_link *card,
                                             const struct pnp_card_device_id *id)
 {
@@ -275,6 +277,7 @@ static int __devinit snd_ad1816a_pnp_detect(struct pnp_card_link *card,
                 if (res < 0)
                         return res;
                 dev++;
+                ad1816a_devices++;
                 return 0;
         }
         return -ENODEV;
@@ -297,10 +300,13 @@ static struct pnp_card_driver ad1816a_pnpc_driver = {
 
 static int __init alsa_card_ad1816a_init(void)
 {
-        int cards;
+        int err;
+
+        err = pnp_register_card_driver(&ad1816a_pnpc_driver);
+        if (err)
+                return err;
 
-        cards = pnp_register_card_driver(&ad1816a_pnpc_driver);
-        if (cards <= 0) {
+        if (!ad1816a_devices) {
                 pnp_unregister_card_driver(&ad1816a_pnpc_driver);
 #ifdef MODULE
                 printk(KERN_ERR "no AD1816A based soundcards found.\n");
diff --git a/sound/isa/als100.c b/sound/isa/als100.c
index 9b77c17b3f66..a52bd8a14c9b 100644
--- a/sound/isa/als100.c
+++ b/sound/isa/als100.c
@@ -199,7 +199,7 @@ static int __devinit snd_card_als100_pnp(int dev, struct snd_card_als100 *acard,
         return 0;
 }
 
-static int __init snd_card_als100_probe(int dev,
+static int __devinit snd_card_als100_probe(int dev,
                                         struct pnp_card_link *pcard,
                                         const struct pnp_card_device_id *pid)
 {
@@ -281,6 +281,8 @@ static int __init snd_card_als100_probe(int dev,
         return 0;
 }
 
+static unsigned int __devinitdata als100_devices;
+
 static int __devinit snd_als100_pnp_detect(struct pnp_card_link *card,
                                            const struct pnp_card_device_id *id)
 {
@@ -294,6 +296,7 @@ static int __devinit snd_als100_pnp_detect(struct pnp_card_link *card,
                 if (res < 0)
                         return res;
                 dev++;
+                als100_devices++;
                 return 0;
         }
         return -ENODEV;
@@ -345,10 +348,13 @@ static struct pnp_card_driver als100_pnpc_driver = {
 
 static int __init alsa_card_als100_init(void)
 {
-        int cards;
+        int err;
+
+        err = pnp_register_card_driver(&als100_pnpc_driver);
+        if (err)
+                return err;
 
-        cards = pnp_register_card_driver(&als100_pnpc_driver);
-        if (cards <= 0) {
+        if (!als100_devices) {
                 pnp_unregister_card_driver(&als100_pnpc_driver);
 #ifdef MODULE
                 snd_printk(KERN_ERR "no ALS100 based soundcards found\n");
diff --git a/sound/isa/azt2320.c b/sound/isa/azt2320.c
index a530691bf4f7..15e59283aac6 100644
--- a/sound/isa/azt2320.c
+++ b/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");
diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c
index fd9bb2575de8..fa63048a8b9d 100644
--- a/sound/isa/cmi8330.c
+++ b/sound/isa/cmi8330.c
@@ -175,7 +175,7 @@ MODULE_DEVICE_TABLE(pnp_card, snd_cmi8330_pnpids);
 #endif
 
 
-static struct ad1848_mix_elem snd_cmi8330_controls[] __initdata = {
+static struct ad1848_mix_elem snd_cmi8330_controls[] __devinitdata = {
 AD1848_DOUBLE("Master Playback Volume", 0, CMI8330_MASTVOL, CMI8330_MASTVOL, 4, 0, 15, 0),
 AD1848_SINGLE("Loud Playback Switch", 0, CMI8330_MUTEMUX, 6, 1, 1),
 AD1848_DOUBLE("PCM Playback Switch", 0, AD1848_LEFT_OUTPUT, AD1848_RIGHT_OUTPUT, 7, 7, 1, 1),
@@ -204,7 +204,7 @@ AD1848_SINGLE(SNDRV_CTL_NAME_IEC958("Input ",PLAYBACK,SWITCH), 0, CMI8330_MUTEMU
 };
 
 #ifdef ENABLE_SB_MIXER
-static struct sbmix_elem cmi8330_sb_mixers[] __initdata = {
+static struct sbmix_elem cmi8330_sb_mixers[] __devinitdata = {
 SB_DOUBLE("SB Master Playback Volume", SB_DSP4_MASTER_DEV, (SB_DSP4_MASTER_DEV + 1), 3, 3, 31),
 SB_DOUBLE("Tone Control - Bass", SB_DSP4_BASS_DEV, (SB_DSP4_BASS_DEV + 1), 4, 4, 15),
 SB_DOUBLE("Tone Control - Treble", SB_DSP4_TREBLE_DEV, (SB_DSP4_TREBLE_DEV + 1), 4, 4, 15),
@@ -222,7 +222,7 @@ SB_DOUBLE("SB Playback Volume", SB_DSP4_OGAIN_DEV, (SB_DSP4_OGAIN_DEV + 1), 6, 6
 SB_SINGLE("SB Mic Auto Gain", SB_DSP4_MIC_AGC, 0, 1),
 };
 
-static unsigned char cmi8330_sb_init_values[][2] __initdata = {
+static unsigned char cmi8330_sb_init_values[][2] __devinitdata = {
         { SB_DSP4_MASTER_DEV + 0, 0 },
         { SB_DSP4_MASTER_DEV + 1, 0 },
         { SB_DSP4_PCM_DEV + 0, 0 },
@@ -545,7 +545,7 @@ static int __devinit snd_cmi8330_probe(struct snd_card *card, int dev)
         return snd_card_register(card);
 }
 
-static int __init snd_cmi8330_nonpnp_probe(struct platform_device *pdev)
+static int __devinit snd_cmi8330_nonpnp_probe(struct platform_device *pdev)
 {
         struct snd_card *card;
         int err;
@@ -607,6 +607,8 @@ static struct platform_driver snd_cmi8330_driver = {
 
 
 #ifdef CONFIG_PNP
+static unsigned int __devinitdata cmi8330_pnp_devices;
+
 static int __devinit snd_cmi8330_pnp_detect(struct pnp_card_link *pcard,
                                             const struct pnp_card_device_id *pid)
 {
@@ -636,6 +638,7 @@ static int __devinit snd_cmi8330_pnp_detect(struct pnp_card_link *pcard,
         }
         pnp_set_card_drvdata(pcard, card);
         dev++;
+        cmi8330_pnp_devices++;
         return 0;
 }
 
@@ -706,9 +709,9 @@ static int __init alsa_card_cmi8330_init(void)
 
 #ifdef CONFIG_PNP
         err = pnp_register_card_driver(&cmi8330_pnpc_driver);
-        if (err >= 0) {
+        if (!err) {
                 pnp_registered = 1;
-                cards += err;
+                cards += cmi8330_pnp_devices;
         }
 #endif
 
diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c
index 4060918e0327..382bb17ef49f 100644
--- a/sound/isa/cs423x/cs4236.c
+++ b/sound/isa/cs423x/cs4236.c
@@ -133,6 +133,7 @@ static int pnpc_registered;
 static int pnp_registered;
 #endif
 #endif /* CONFIG_PNP */
+static unsigned int snd_cs423x_devices;
 
 struct snd_card_cs4236 {
         struct snd_cs4231 *chip;
@@ -564,7 +565,7 @@ static int __init snd_cs423x_nonpnp_probe(struct platform_device *pdev)
                 snd_card_free(card);
                 return err;
         }
-        
+
         platform_set_drvdata(pdev, card);
         return 0;
 }
@@ -650,6 +651,7 @@ static int __devinit snd_cs4232_pnpbios_detect(struct pnp_dev *pdev,
         }
         pnp_set_drvdata(pdev, card);
         dev++;
+        snd_cs423x_devices++;
         return 0;
 }
 
@@ -713,6 +715,7 @@ static int __devinit snd_cs423x_pnpc_detect(struct pnp_card_link *pcard,
         }
         pnp_set_card_drvdata(pcard, card);
         dev++;
+        snd_cs423x_devices++;
         return 0;
 }
 
@@ -721,7 +724,7 @@ static void __devexit snd_cs423x_pnpc_remove(struct pnp_card_link * pcard)
         snd_card_free(pnp_get_card_drvdata(pcard));
         pnp_set_card_drvdata(pcard, NULL);
 }
-                        
+
 #ifdef CONFIG_PM
 static int snd_cs423x_pnpc_suspend(struct pnp_card_link *pcard, pm_message_t state)
 {
@@ -766,7 +769,7 @@ static void __init_or_module snd_cs423x_unregister_all(void)
 
 static int __init alsa_card_cs423x_init(void)
 {
-        int i, err, cards = 0;
+        int i, err;
 
         if ((err = platform_driver_register(&cs423x_nonpnp_driver)) < 0)
                 return err;
@@ -782,24 +785,20 @@ static int __init alsa_card_cs423x_init(void)
                         goto errout;
                 }
                 platform_devices[i] = device;
-                cards++;
+                snd_cs423x_devices++;
         }
 #ifdef CONFIG_PNP
 #ifdef CS4232
-        i = pnp_register_driver(&cs4232_pnp_driver);
-        if (i >= 0) {
+        err = pnp_register_driver(&cs4232_pnp_driver);
+        if (!err)
                 pnp_registered = 1;
-                cards += i;
-        }
 #endif
-        i = pnp_register_card_driver(&cs423x_pnpc_driver);
-        if (i >= 0) {
+        err = pnp_register_card_driver(&cs423x_pnpc_driver);
+        if (!err)
                 pnpc_registered = 1;
-                cards += i;
-        }
 #endif /* CONFIG_PNP */
 
-        if (!cards) {
+        if (!snd_cs423x_devices) {
 #ifdef MODULE
                 printk(KERN_ERR IDENT " soundcard not found or device busy\n");
 #endif
diff --git a/sound/isa/dt019x.c b/sound/isa/dt019x.c
index 50e7bc5ef561..0acb4e5da47f 100644
--- a/sound/isa/dt019x.c
+++ b/sound/isa/dt019x.c
@@ -272,6 +272,8 @@ static int __devinit snd_card_dt019x_probe(int dev, struct pnp_card_link *pcard,
         return 0;
 }
 
+static unsigned int __devinitdata dt019x_devices;
+
 static int __devinit snd_dt019x_pnp_probe(struct pnp_card_link *card,
                                           const struct pnp_card_device_id *pid)
 {
@@ -285,6 +287,7 @@ static int __devinit snd_dt019x_pnp_probe(struct pnp_card_link *card,
                 if (res < 0)
                         return res;
                 dev++;
+                dt019x_devices++;
                 return 0;
         }
         return -ENODEV;
@@ -336,10 +339,13 @@ static struct pnp_card_driver dt019x_pnpc_driver = {
 
 static int __init alsa_card_dt019x_init(void)
 {
-        int cards = 0;
+        int err;
+
+        err = pnp_register_card_driver(&dt019x_pnpc_driver);
+        if (err)
+                return err;
 
-        cards = pnp_register_card_driver(&dt019x_pnpc_driver);
-        if (cards <= 0) {
+        if (!dt019x_devices) {
                 pnp_unregister_card_driver(&dt019x_pnpc_driver);
 #ifdef MODULE
                 snd_printk(KERN_ERR "no DT-019X / ALS-007 based soundcards found\n");
diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c
index 721955d26194..9fbc185b4cc2 100644
--- a/sound/isa/es18xx.c
+++ b/sound/isa/es18xx.c
@@ -2204,7 +2204,7 @@ static int __devinit snd_audiodrive_probe(struct snd_card *card, int dev)
         return snd_card_register(card);
 }
 
-static int __init snd_es18xx_nonpnp_probe1(int dev, struct platform_device *devptr)
+static int __devinit snd_es18xx_nonpnp_probe1(int dev, struct platform_device *devptr)
 {
         struct snd_card *card;
         int err;
@@ -2221,7 +2221,7 @@ static int __init snd_es18xx_nonpnp_probe1(int dev, struct platform_device *devp
         return 0;
 }
 
-static int __init snd_es18xx_nonpnp_probe(struct platform_device *pdev)
+static int __devinit snd_es18xx_nonpnp_probe(struct platform_device *pdev)
 {
         int dev = pdev->id;
         int err;
@@ -2297,6 +2297,8 @@ static struct platform_driver snd_es18xx_nonpnp_driver = {
 
 
 #ifdef CONFIG_PNP
+static unsigned int __devinitdata es18xx_pnp_devices;
+
 static int __devinit snd_audiodrive_pnp_detect(struct pnp_card_link *pcard,
                                                const struct pnp_card_device_id *pid)
 {
@@ -2327,6 +2329,7 @@ static int __devinit snd_audiodrive_pnp_detect(struct pnp_card_link *pcard,
 
         pnp_set_card_drvdata(pcard, card);
         dev++;
+        es18xx_pnp_devices++;
         return 0;
 }
 
@@ -2397,10 +2400,10 @@ static int __init alsa_card_es18xx_init(void)
         }
 
 #ifdef CONFIG_PNP
-        i = pnp_register_card_driver(&es18xx_pnpc_driver);
-        if (i >= 0) {
+        err = pnp_register_card_driver(&es18xx_pnpc_driver);
+        if (!err) {
                 pnp_registered = 1;
-                cards += i;
+                cards += es18xx_pnp_devices;
         }
 #endif
 
diff --git a/sound/isa/gus/interwave.c b/sound/isa/gus/interwave.c
index 2cacd0fa6871..de71b7a99c83 100644
--- a/sound/isa/gus/interwave.c
+++ b/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) {
diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c
index 56fcd8a946a4..c906e205d7d5 100644
--- a/sound/isa/opl3sa2.c
+++ b/sound/isa/opl3sa2.c
@@ -95,6 +95,7 @@ static struct platform_device *platform_devices[SNDRV_CARDS];
 static int pnp_registered;
 static int pnpc_registered;
 #endif
+static unsigned int snd_opl3sa2_devices;
 
 /* control ports */
 #define OPL3SA2_PM_CTRL         0x01
@@ -760,6 +761,7 @@ static int __devinit snd_opl3sa2_pnp_detect(struct pnp_dev *pdev,
         }
         pnp_set_drvdata(pdev, card);
         dev++;
+        snd_opl3sa2_devices++;
         return 0;
 }
 
@@ -826,6 +828,7 @@ static int __devinit snd_opl3sa2_pnp_cdetect(struct pnp_card_link *pcard,
         }
         pnp_set_card_drvdata(pcard, card);
         dev++;
+        snd_opl3sa2_devices++;
         return 0;
 }
 
@@ -944,7 +947,7 @@ static void __init_or_module snd_opl3sa2_unregister_all(void)
 
 static int __init alsa_card_opl3sa2_init(void)
 {
-        int i, err, cards = 0;
+        int i, err;
 
         if ((err = platform_driver_register(&snd_opl3sa2_nonpnp_driver)) < 0)
                 return err;
@@ -964,23 +967,19 @@ static int __init alsa_card_opl3sa2_init(void)
                         goto errout;
                 }
                 platform_devices[i] = device;
-                cards++;
+                snd_opl3sa2_devices++;
         }
 
 #ifdef CONFIG_PNP
         err = pnp_register_driver(&opl3sa2_pnp_driver);
-        if (err >= 0) {
+        if (!err)
                 pnp_registered = 1;
-                cards += err;
-        }
         err = pnp_register_card_driver(&opl3sa2_pnpc_driver);
-        if (err >= 0) {
+        if (!err)
                 pnpc_registered = 1;
-                cards += err;
-        }
 #endif
 
-        if (!cards) {
+        if (!snd_opl3sa2_devices) {
 #ifdef MODULE
                 snd_printk(KERN_ERR "Yamaha OPL3-SA soundcard not found or device busy\n");
 #endif
diff --git a/sound/isa/sb/es968.c b/sound/isa/sb/es968.c
index 9da80bfa3027..d4d65b84265a 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 __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");
diff --git a/sound/isa/sb/sb16.c b/sound/isa/sb/sb16.c
index 5737ab76160c..21ea65925a9e 100644
--- a/sound/isa/sb/sb16.c
+++ b/sound/isa/sb/sb16.c
@@ -369,7 +369,7 @@ static struct snd_card *snd_sb16_card_new(int dev)
         return card;
 }
 
-static int __init snd_sb16_probe(struct snd_card *card, int dev)
+static int __devinit snd_sb16_probe(struct snd_card *card, int dev)
 {
         int xirq, xdma8, xdma16;
         struct snd_sb *chip;
@@ -518,7 +518,7 @@ static int snd_sb16_resume(struct snd_card *card)
 }
 #endif
 
-static int __init snd_sb16_nonpnp_probe1(int dev, struct platform_device *devptr)
+static int __devinit snd_sb16_nonpnp_probe1(int dev, struct platform_device *devptr)
 {
         struct snd_card_sb16 *acard;
         struct snd_card *card;
@@ -548,7 +548,7 @@ static int __init snd_sb16_nonpnp_probe1(int dev, struct platform_device *devptr
 }
 
 
-static int __init snd_sb16_nonpnp_probe(struct platform_device *pdev)
+static int __devinit snd_sb16_nonpnp_probe(struct platform_device *pdev)
 {
         int dev = pdev->id;
         int err;
@@ -629,6 +629,7 @@ static struct platform_driver snd_sb16_nonpnp_driver = {
 
 
 #ifdef CONFIG_PNP
+static unsigned int __devinitdata sb16_pnp_devices;
 
 static int __devinit snd_sb16_pnp_detect(struct pnp_card_link *pcard,
                                          const struct pnp_card_device_id *pid)
@@ -651,6 +652,7 @@ static int __devinit snd_sb16_pnp_detect(struct pnp_card_link *pcard,
                 }
                 pnp_set_card_drvdata(pcard, card);
                 dev++;
+                sb16_pnp_devices++;
                 return 0;
         }
 
@@ -727,10 +729,10 @@ static int __init alsa_card_sb16_init(void)
         }
 #ifdef CONFIG_PNP
         /* PnP cards at last */
-        i = pnp_register_card_driver(&sb16_pnpc_driver);
-        if (i >= 0) {
+        err = pnp_register_card_driver(&sb16_pnpc_driver);
+        if (!err) {
                 pnp_registered = 1;
-                cards += i;
+                cards += sb16_pnp_devices;
         }
 #endif
 
diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c
index 29bba8cc3ef3..48e5552d3444 100644
--- a/sound/isa/sscape.c
+++ b/sound/isa/sscape.c
@@ -1255,7 +1255,7 @@ static int __devinit create_sscape(int dev, struct snd_card **rcardp)
 }
 
 
-static int __init snd_sscape_probe(struct platform_device *pdev)
+static int __devinit snd_sscape_probe(struct platform_device *pdev)
 {
         int dev = pdev->id;
         struct snd_card *card;
@@ -1469,7 +1469,7 @@ static int __init sscape_init(void)
         if (ret < 0)
                 return ret;
 #ifdef CONFIG_PNP
-        if (pnp_register_card_driver(&sscape_pnpc_driver) >= 0)
+        if (pnp_register_card_driver(&sscape_pnpc_driver) == 0)
                 pnp_registered = 1;
 #endif
         return 0;
diff --git a/sound/isa/wavefront/wavefront.c b/sound/isa/wavefront/wavefront.c
index c0115bf9065e..2f13cd5d4dcb 100644
--- a/sound/isa/wavefront/wavefront.c
+++ b/sound/isa/wavefront/wavefront.c
@@ -589,7 +589,7 @@ snd_wavefront_probe (struct snd_card *card, int dev)
         return snd_card_register(card);
 }       
 
-static int __init snd_wavefront_nonpnp_probe(struct platform_device *pdev)
+static int __devinit snd_wavefront_nonpnp_probe(struct platform_device *pdev)
 {
         int dev = pdev->id;
         struct snd_card *card;
@@ -637,6 +637,7 @@ static struct platform_driver snd_wavefront_driver = {
 
 
 #ifdef CONFIG_PNP
+static unsigned int __devinitdata wavefront_pnp_devices;
 
 static int __devinit snd_wavefront_pnp_detect(struct pnp_card_link *pcard,
                                               const struct pnp_card_device_id *pid)
@@ -670,6 +671,7 @@ static int __devinit snd_wavefront_pnp_detect(struct pnp_card_link *pcard,
 
         pnp_set_card_drvdata(pcard, card);
         dev++;
+        wavefront_pnp_devices++;
         return 0;
 }
 
@@ -729,10 +731,10 @@ static int __init alsa_card_wavefront_init(void)
         }
 
 #ifdef CONFIG_PNP
-        i = pnp_register_card_driver(&wavefront_pnpc_driver);
-        if (i >= 0) {
+        err = pnp_register_card_driver(&wavefront_pnpc_driver);
+        if (!err) {
                 pnp_registered = 1;
-                cards += i;
+                cards += wavefront_pnp_devices;
         }
 #endif