4 files changed, 68 insertions, 14 deletions

diff --git a/sound/isa/gus/gusclassic.c b/sound/isa/gus/gusclassic.c
index 57beb74f5b9d..d1165b96fa3f 100644
--- a/sound/isa/gus/gusclassic.c
+++ b/sound/isa/gus/gusclassic.c
@@ -71,6 +71,8 @@ MODULE_PARM_DESC(channels, "GF1 channels for GUS Classic driver.");
 module_param_array(pcm_channels, int, NULL, 0444);
 MODULE_PARM_DESC(pcm_channels, "Reserved PCM channels for GUS Classic driver.");
 
+static struct platform_device *devices[SNDRV_CARDS];
+
 
 #define PFX     "gusclassic: "
 
@@ -227,6 +229,15 @@ static struct platform_driver snd_gusclassic_driver = {
         },
 };
 
+static void __init_or_module snd_gusclassic_unregister_all(void)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(devices); ++i)
+                platform_device_unregister(devices[i]);
+        platform_driver_unregister(&snd_gusclassic_driver);
+}
+
 static int __init alsa_card_gusclassic_init(void)
 {
         int i, cards, err;
@@ -244,6 +255,7 @@ static int __init alsa_card_gusclassic_init(void)
                         err = PTR_ERR(device);
                         goto errout;
                 }
+                devices[i] = device;
                 cards++;
         }
         if (!cards) {
@@ -256,13 +268,13 @@ static int __init alsa_card_gusclassic_init(void)
         return 0;
 
  errout:
-        platform_driver_unregister(&snd_gusclassic_driver);
+        snd_gusclassic_unregister_all();
         return err;
 }
 
 static void __exit alsa_card_gusclassic_exit(void)
 {
-        platform_driver_unregister(&snd_gusclassic_driver);
+        snd_gusclassic_unregister_all();
 }
 
 module_init(alsa_card_gusclassic_init)
diff --git a/sound/isa/gus/gusextreme.c b/sound/isa/gus/gusextreme.c
index 6fad9734a853..239f16e6b9ee 100644
--- a/sound/isa/gus/gusextreme.c
+++ b/sound/isa/gus/gusextreme.c
@@ -87,6 +87,8 @@ MODULE_PARM_DESC(channels, "GF1 channels for GUS Extreme driver.");
 module_param_array(pcm_channels, int, NULL, 0444);
 MODULE_PARM_DESC(pcm_channels, "Reserved PCM channels for GUS Extreme driver.");
 
+struct platform_device *devices[SNDRV_CARDS];
+
 
 #define PFX     "gusextreme: "
 
@@ -337,6 +339,15 @@ static struct platform_driver snd_gusextreme_driver = {
         },
 };
 
+static void __init_or_module snd_gusextreme_unregister_all(void)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(devices); ++i)
+                platform_device_unregister(devices[i]);
+        platform_driver_unregister(&snd_gusextreme_driver);
+}
+
 static int __init alsa_card_gusextreme_init(void)
 {
         int i, cards, err;
@@ -354,6 +365,7 @@ static int __init alsa_card_gusextreme_init(void)
                         err = PTR_ERR(device);
                         goto errout;
                 }
+                devices[i] = device;
                 cards++;
         }
         if (!cards) {
@@ -366,13 +378,13 @@ static int __init alsa_card_gusextreme_init(void)
         return 0;
 
  errout:
-        platform_driver_unregister(&snd_gusextreme_driver);
+        snd_gusextreme_unregister_all();
         return err;
 }
 
 static void __exit alsa_card_gusextreme_exit(void)
 {
-        platform_driver_unregister(&snd_gusextreme_driver);
+        snd_gusextreme_unregister_all();
 }
 
 module_init(alsa_card_gusextreme_init)
diff --git a/sound/isa/gus/gusmax.c b/sound/isa/gus/gusmax.c
index d1b70ee9b039..d4d2b2a517d5 100644
--- a/sound/isa/gus/gusmax.c
+++ b/sound/isa/gus/gusmax.c
@@ -72,6 +72,8 @@ MODULE_PARM_DESC(channels, "Used GF1 channels for GUS MAX driver.");
 module_param_array(pcm_channels, int, NULL, 0444);
 MODULE_PARM_DESC(pcm_channels, "Reserved PCM channels for GUS MAX driver.");
 
+static struct platform_device *devices[SNDRV_CARDS];
+
 struct snd_gusmax {
         int irq;
         struct snd_card *card;
@@ -364,6 +366,15 @@ static struct platform_driver snd_gusmax_driver = {
         },
 };
 
+static void __init_or_module snd_gusmax_unregister_all(void)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(devices); ++i)
+                platform_device_unregister(devices[i]);
+        platform_driver_unregister(&snd_gusmax_driver);
+}
+
 static int __init alsa_card_gusmax_init(void)
 {
         int i, cards, err;
@@ -381,6 +392,7 @@ static int __init alsa_card_gusmax_init(void)
                         err = PTR_ERR(device);
                         goto errout;
                 }
+                devices[i] = device;
                 cards++;
         }
         if (!cards) {
@@ -393,13 +405,13 @@ static int __init alsa_card_gusmax_init(void)
         return 0;
 
  errout:
-        platform_driver_unregister(&snd_gusmax_driver);
+        snd_gusmax_unregister_all();
         return err;
 }
 
 static void __exit alsa_card_gusmax_exit(void)
 {
-        platform_driver_unregister(&snd_gusmax_driver);
+        snd_gusmax_unregister_all();
 }
 
 module_init(alsa_card_gusmax_init)
diff --git a/sound/isa/gus/interwave.c b/sound/isa/gus/interwave.c
index 67a5f7402453..9838d992b101 100644
--- a/sound/isa/gus/interwave.c
+++ b/sound/isa/gus/interwave.c
@@ -115,6 +115,9 @@ MODULE_PARM_DESC(pcm_channels, "Reserved PCM channels for InterWave driver.");
 module_param_array(effect, int, NULL, 0444);
 MODULE_PARM_DESC(effect, "Effects enable for InterWave driver.");
 
+static struct platform_device *platform_devices[SNDRV_CARDS];
+static int pnp_registered;
+
 struct snd_interwave {
         int irq;
         struct snd_card *card;
@@ -914,6 +917,17 @@ static struct pnp_card_driver interwave_pnpc_driver = {
 
 #endif /* CONFIG_PNP */
 
+static void __init_or_module snd_interwave_unregister_all(void)
+{
+        int i;
+
+        if (pnp_registered)
+                pnp_unregister_card_driver(&interwave_pnpc_driver);
+        for (i = 0; i < ARRAY_SIZE(platform_devices); ++i)
+                platform_device_unregister(platform_devices[i]);
+        platform_driver_unregister(&snd_interwave_driver);
+}
+
 static int __init alsa_card_interwave_init(void)
 {
         int i, err, cards = 0;
@@ -931,32 +945,36 @@ static int __init alsa_card_interwave_init(void)
                                                          i, NULL, 0);
                 if (IS_ERR(device)) {
                         err = PTR_ERR(device);
-                        platform_driver_unregister(&snd_interwave_driver);
-                        return err;
+                        goto errout;
                 }
+                platform_devices[i] = device;
                 cards++;
         }
 
         /* ISA PnP cards */
         i = pnp_register_card_driver(&interwave_pnpc_driver);
-        if (i > 0)
+        if (i >= 0) {
+                pnp_registered = 1;
                 cards += i;
+        }
 
         if (!cards) {
-                pnp_unregister_card_driver(&interwave_pnpc_driver);
-                platform_driver_unregister(&snd_interwave_driver);
 #ifdef MODULE
                 printk(KERN_ERR "InterWave soundcard not found or device busy\n");
 #endif
-                return -ENODEV;
+                err = -ENODEV;
+                goto errout;
         }
         return 0;
+
+ errout:
+        snd_interwave_unregister_all();
+        return err;
 }
 
 static void __exit alsa_card_interwave_exit(void)
 {
-        pnp_unregister_card_driver(&interwave_pnpc_driver);
-        platform_driver_unregister(&snd_interwave_driver);
+        snd_interwave_unregister_all();
 }
 
 module_init(alsa_card_interwave_init)