From b3743926a27b0c129baded5a27f4998b1c7f5e10 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Tue, 20 Jul 2010 15:19:49 -0700 Subject: [PATCH] --- yaml --- r: 202477 b: refs/heads/master c: a0dba697eec78fb2d4e2b76b83104a2b251ae70d h: refs/heads/master i: 202475: 3e4cc5c7004098cedb5c17d397f34e6d26195112 v: v3 --- [refs] | 2 +- trunk/drivers/platform/x86/acerhdf.c | 23 ++++++++++++++++------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index a7c0ec32c209..5aa5f8854991 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6a984a06487129f013ee2df6ce98b6cfada1e7b1 +refs/heads/master: a0dba697eec78fb2d4e2b76b83104a2b251ae70d diff --git a/trunk/drivers/platform/x86/acerhdf.c b/trunk/drivers/platform/x86/acerhdf.c index 4ce28d901b9a..60f9cfcac93f 100644 --- a/trunk/drivers/platform/x86/acerhdf.c +++ b/trunk/drivers/platform/x86/acerhdf.c @@ -615,17 +615,26 @@ static int acerhdf_register_platform(void) return err; 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; + +err_device_add: + platform_device_put(acerhdf_dev); +err_device_alloc: + platform_driver_unregister(&acerhdf_driver); + return err; } 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); } @@ -669,7 +678,7 @@ static int __init acerhdf_init(void) err = acerhdf_register_platform(); if (err) - goto err_unreg; + goto out_err; err = acerhdf_register_thermal(); if (err) @@ -682,7 +691,7 @@ static int __init acerhdf_init(void) acerhdf_unregister_platform(); out_err: - return -ENODEV; + return err; } static void __exit acerhdf_exit(void)