|
@@ -615,17 +615,26 @@ static int acerhdf_register_platform(void)
|
|
return err;
|
|
return err;
|
|
|
|
|
|
acerhdf_dev = platform_device_alloc("acerhdf", -1);
|
|
acerhdf_dev = platform_device_alloc("acerhdf", -1);
|
|
- platform_device_add(acerhdf_dev);
|
|
|
|
|
|
+ if (!acerhdf_dev) {
|
|
|
|
+ err = -ENOMEM;
|
|
|
|
+ goto err_device_alloc;
|
|
|
|
+ }
|
|
|
|
+ err = platform_device_add(acerhdf_dev);
|
|
|
|
+ if (err)
|
|
|
|
+ goto err_device_add;
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
|
|
+
|
|
|
|
+err_device_add:
|
|
|
|
+ platform_device_put(acerhdf_dev);
|
|
|
|
+err_device_alloc:
|
|
|
|
+ platform_driver_unregister(&acerhdf_driver);
|
|
|
|
+ return err;
|
|
}
|
|
}
|
|
|
|
|
|
static void acerhdf_unregister_platform(void)
|
|
static void acerhdf_unregister_platform(void)
|
|
{
|
|
{
|
|
- if (!acerhdf_dev)
|
|
|
|
- return;
|
|
|
|
-
|
|
|
|
- platform_device_del(acerhdf_dev);
|
|
|
|
|
|
+ platform_device_unregister(acerhdf_dev);
|
|
platform_driver_unregister(&acerhdf_driver);
|
|
platform_driver_unregister(&acerhdf_driver);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -669,7 +678,7 @@ static int __init acerhdf_init(void)
|
|
|
|
|
|
err = acerhdf_register_platform();
|
|
err = acerhdf_register_platform();
|
|
if (err)
|
|
if (err)
|
|
- goto err_unreg;
|
|
|
|
|
|
+ goto out_err;
|
|
|
|
|
|
err = acerhdf_register_thermal();
|
|
err = acerhdf_register_thermal();
|
|
if (err)
|
|
if (err)
|
|
@@ -682,7 +691,7 @@ err_unreg:
|
|
acerhdf_unregister_platform();
|
|
acerhdf_unregister_platform();
|
|
|
|
|
|
out_err:
|
|
out_err:
|
|
- return -ENODEV;
|
|
|
|
|
|
+ return err;
|
|
}
|
|
}
|
|
|
|
|
|
static void __exit acerhdf_exit(void)
|
|
static void __exit acerhdf_exit(void)
|