[ALSA] unregister platform device again if probe was unsuccessful

This second one unregisters the platform device again when the probe is
unsuccesful for sound/drivers, sound/arm/sa11xx-uda1341.c and
sound/ppc/powermac.c. This gets them all.

Signed-off-by: Rene Herman <rene.herman@keyaccess.nl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

7 files changed, 43 insertions, 15 deletions

diff --git a/sound/arm/sa11xx-uda1341.c b/sound/arm/sa11xx-uda1341.c
index 13057d92f08a..9211348824a7 100644
--- a/sound/arm/sa11xx-uda1341.c
+++ b/sound/arm/sa11xx-uda1341.c
@@ -984,11 +984,15 @@ static int __init sa11xx_uda1341_init(void)
         if ((err = platform_driver_register(&sa11xx_uda1341_driver)) < 0)
                 return err;
         device = platform_device_register_simple(SA11XX_UDA1341_DRIVER, -1, NULL, 0);
-        if (IS_ERR(device)) {
-                platform_driver_unregister(&sa11xx_uda1341_driver);
-                return PTR_ERR(device);
-        }
-        return 0;
+        if (!IS_ERR(device)) {
+                if (platform_get_drvdata(device))
+                        return 0;
+                platform_device_unregister(device);
+                err = -ENODEV
+        } else
+                err = PTR_ERR(device);
+        platform_driver_unregister(&sa11xx_uda1341_driver);
+        return err;
 }
 
 static void __exit sa11xx_uda1341_exit(void)
diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c
index ae0df549fac7..ffeafaf2ecca 100644
--- a/sound/drivers/dummy.c
+++ b/sound/drivers/dummy.c
@@ -677,6 +677,10 @@ static int __init alsa_card_dummy_init(void)
                                                          i, NULL, 0);
                 if (IS_ERR(device))
                         continue;
+                if (!platform_get_drvdata(device)) {
+                        platform_device_unregister(device);
+                        continue;
+                }
                 devices[i] = device;
                 cards++;
         }
diff --git a/sound/drivers/mpu401/mpu401.c b/sound/drivers/mpu401/mpu401.c
index 77b06009735d..d3cbbb047582 100644
--- a/sound/drivers/mpu401/mpu401.c
+++ b/sound/drivers/mpu401/mpu401.c
@@ -253,6 +253,10 @@ static int __init alsa_card_mpu401_init(void)
                                                          i, NULL, 0);
                 if (IS_ERR(device))
                         continue;
+                if (!platform_get_drvdata(device)) {
+                        platform_device_unregister(device);
+                        continue;
+                }
                 platform_devices[i] = device;
                 snd_mpu401_devices++;
         }
diff --git a/sound/drivers/mtpav.c b/sound/drivers/mtpav.c
index b7a0b42813e1..474eed06e70f 100644
--- a/sound/drivers/mtpav.c
+++ b/sound/drivers/mtpav.c
@@ -770,11 +770,15 @@ static int __init alsa_card_mtpav_init(void)
                 return err;
 
         device = platform_device_register_simple(SND_MTPAV_DRIVER, -1, NULL, 0);
-        if (IS_ERR(device)) {
-                platform_driver_unregister(&snd_mtpav_driver);
-                return PTR_ERR(device);
-        }
-        return 0;
+        if (!IS_ERR(device)) {
+                if (platform_get_drvdata(device))
+                        return 0;
+                platform_device_unregister(device);
+                err = -ENODEV;
+        } else
+                err = PTR_ERR(device);
+        platform_driver_unregister(&snd_mtpav_driver);
+        return err;
 }
 
 static void __exit alsa_card_mtpav_exit(void)
diff --git a/sound/drivers/serial-u16550.c b/sound/drivers/serial-u16550.c
index c01b4c5118b9..2330fec505da 100644
--- a/sound/drivers/serial-u16550.c
+++ b/sound/drivers/serial-u16550.c
@@ -998,6 +998,10 @@ static int __init alsa_card_serial_init(void)
                                                          i, NULL, 0);
                 if (IS_ERR(device))
                         continue;
+                if (!platform_get_drvdata(device)) {
+                        platform_device_unregister(device);
+                        continue;
+                }
                 devices[i] = device;
                 cards++;
         }
diff --git a/sound/drivers/virmidi.c b/sound/drivers/virmidi.c
index 26eb2499d442..59171f8200df 100644
--- a/sound/drivers/virmidi.c
+++ b/sound/drivers/virmidi.c
@@ -171,6 +171,10 @@ static int __init alsa_card_virmidi_init(void)
                                                          i, NULL, 0);
                 if (IS_ERR(device))
                         continue;
+                if (!platform_get_drvdata(device)) {
+                        platform_device_unregister(device);
+                        continue;
+                }
                 devices[i] = device;
                 cards++;
         }
diff --git a/sound/ppc/powermac.c b/sound/ppc/powermac.c
index f4902a219e50..875f1f7bdc58 100644
--- a/sound/ppc/powermac.c
+++ b/sound/ppc/powermac.c
@@ -188,11 +188,15 @@ static int __init alsa_card_pmac_init(void)
         if ((err = platform_driver_register(&snd_pmac_driver)) < 0)
                 return err;
         device = platform_device_register_simple(SND_PMAC_DRIVER, -1, NULL, 0);
-        if (IS_ERR(device)) {
-                platform_driver_unregister(&snd_pmac_driver);
-                return PTR_ERR(device);
-        }
-        return 0;
+        if (!IS_ERR(device)) {
+                if (platform_get_drvdata(device))
+                        return 0;
+                platform_device_unregister(device);
+                err = -ENODEV;
+        } else
+                err = PTR_ERR(device);
+        platform_driver_unregister(&snd_pmac_driver);
+        return err;
 
 }