1 files changed, 14 insertions, 2 deletions

diff --git a/sound/isa/ad1848/ad1848.c b/sound/isa/ad1848/ad1848.c
index 1019e9fdff53..e091bbeffd2a 100644
--- a/sound/isa/ad1848/ad1848.c
+++ b/sound/isa/ad1848/ad1848.c
@@ -62,6 +62,8 @@ MODULE_PARM_DESC(dma1, "DMA1 # for AD1848 driver.");
 module_param_array(thinkpad, bool, NULL, 0444);
 MODULE_PARM_DESC(thinkpad, "Enable only for the onboard CS4248 of IBM Thinkpad 360/750/755 series.");
 
+static struct platform_device *devices[SNDRV_CARDS];
+
 
 static int __init snd_ad1848_probe(struct platform_device *pdev)
 {
@@ -167,6 +169,15 @@ static struct platform_driver snd_ad1848_driver = {
         },
 };
 
+static void __init_or_module snd_ad1848_unregister_all(void)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(devices); ++i)
+                platform_device_unregister(devices[i]);
+        platform_driver_unregister(&snd_ad1848_driver);
+}
+
 static int __init alsa_card_ad1848_init(void)
 {
         int i, cards, err;
@@ -184,6 +195,7 @@ static int __init alsa_card_ad1848_init(void)
                         err = PTR_ERR(device);
                         goto errout;
                 }
+                devices[i] = device;
                 cards++;
         }
         if (!cards) {
@@ -196,13 +208,13 @@ static int __init alsa_card_ad1848_init(void)
         return 0;
 
  errout:
-        platform_driver_unregister(&snd_ad1848_driver);
+        snd_ad1848_unregister_all();
         return err;
 }
 
 static void __exit alsa_card_ad1848_exit(void)
 {
-        platform_driver_unregister(&snd_ad1848_driver);
+        snd_ad1848_unregister_all();
 }
 
 module_init(alsa_card_ad1848_init)