]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
thermal: Fix error path in thermal_init()
authorLuis Henriques <luis.henriques@canonical.com>
Wed, 3 Dec 2014 21:20:21 +0000 (21:20 +0000)
committerZhang Rui <rui.zhang@intel.com>
Mon, 8 Dec 2014 04:17:25 +0000 (12:17 +0800)
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>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
drivers/thermal/thermal_core.c

index 7b723c7c4cae3d949f205f2b6a3d9215f50118d4..84fdf0792e27cf57c979288a6a9b79543628495f 100644 (file)
@@ -1837,10 +1837,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);