[ALSA] unregister platform device again if probe was unsuccessful
[linux-3.10.git] / sound / ppc / powermac.c
index efa06fe5f01b78e9ecbca908a7fbc30a79d7376f..875f1f7bdc589180539663c517e79bc85cdb4256 100644 (file)
@@ -46,6 +46,8 @@ MODULE_PARM_DESC(id, "ID string for " CHIP_NAME " soundchip.");
 module_param(enable_beep, bool, 0444);
 MODULE_PARM_DESC(enable_beep, "Enable beep using PCM.");
 
+static struct platform_device *device;
+
 
 /*
  */
@@ -182,21 +184,25 @@ static struct platform_driver snd_pmac_driver = {
 static int __init alsa_card_pmac_init(void)
 {
        int err;
-       struct platform_device *device;
 
        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;
 
 }
 
 static void __exit alsa_card_pmac_exit(void)
 {
+       platform_device_unregister(device);
        platform_driver_unregister(&snd_pmac_driver);
 }