diff mbox

thermal: Fix error path in thermal_init()

Message ID 1417641621-5674-1-git-send-email-luis.henriques@canonical.com (mailing list archive)
State Accepted, archived
Delegated to: Zhang Rui
Headers show

Commit Message

Luis Henriques Dec. 3, 2014, 9:20 p.m. UTC 
thermal_unregister_governors() and class_unregister() were being called in
the wrong order.

Fixes: 80a26a5c22b9 ("Thermal: build thermal governors into thermal_sys module")
Cc: stable@vger.kernel.org
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---
 drivers/thermal/thermal_core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Zhang Rui Dec. 8, 2014, 4:17 a.m. UTC | #1 
On Wed, 2014-12-03 at 21:20 +0000, Luis Henriques wrote:
> thermal_unregister_governors() and class_unregister() were being called in
> the wrong order.
> 
> Fixes: 80a26a5c22b9 ("Thermal: build thermal governors into thermal_sys module")
> Cc: stable@vger.kernel.org
> Signed-off-by: Luis Henriques <luis.henriques@canonical.com>

applied.

thanks,
rui
> ---
>  drivers/thermal/thermal_core.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
> index 43b90709585f..488e9bfd996b 100644
> --- a/drivers/thermal/thermal_core.c
> +++ b/drivers/thermal/thermal_core.c
> @@ -1835,10 +1835,10 @@ static int __init thermal_init(void)
>  
>  exit_netlink:
>  	genetlink_exit();
> -unregister_governors:
> -	thermal_unregister_governors();
>  unregister_class:
>  	class_unregister(&thermal_class);
> +unregister_governors:
> +	thermal_unregister_governors();
>  error:
>  	idr_destroy(&thermal_tz_idr);
>  	idr_destroy(&thermal_cdev_idr);


--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 43b90709585f..488e9bfd996b 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -1835,10 +1835,10 @@  static int __init thermal_init(void)
 
 exit_netlink:
 	genetlink_exit();
-unregister_governors:
-	thermal_unregister_governors();
 unregister_class:
 	class_unregister(&thermal_class);
+unregister_governors:
+	thermal_unregister_governors();
 error:
 	idr_destroy(&thermal_tz_idr);
 	idr_destroy(&thermal_cdev_idr);