diff options
author | Luis Henriques <luis.henriques@canonical.com> | 2014-12-03 16:20:21 -0500 |
---|---|---|
committer | Zhang Rui <rui.zhang@intel.com> | 2014-12-07 23:17:25 -0500 |
commit | 9d367e5e7b05c71a8c1ac4e9b6e00ba45a79f2fc (patch) | |
tree | 44ba1f861054ea1e0ded8a463563bfadd5570f6f /drivers/thermal/thermal_core.c | |
parent | b6cc772f64ac7d1917770406844b73a94ca5ef06 (diff) |
thermal: Fix error path in thermal_init()
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>
Diffstat (limited to 'drivers/thermal/thermal_core.c')
-rw-r--r-- | drivers/thermal/thermal_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 7b723c7c4cae..84fdf0792e27 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c | |||
@@ -1837,10 +1837,10 @@ static int __init thermal_init(void) | |||
1837 | 1837 | ||
1838 | exit_netlink: | 1838 | exit_netlink: |
1839 | genetlink_exit(); | 1839 | genetlink_exit(); |
1840 | unregister_governors: | ||
1841 | thermal_unregister_governors(); | ||
1842 | unregister_class: | 1840 | unregister_class: |
1843 | class_unregister(&thermal_class); | 1841 | class_unregister(&thermal_class); |
1842 | unregister_governors: | ||
1843 | thermal_unregister_governors(); | ||
1844 | error: | 1844 | error: |
1845 | idr_destroy(&thermal_tz_idr); | 1845 | idr_destroy(&thermal_tz_idr); |
1846 | idr_destroy(&thermal_cdev_idr); | 1846 | idr_destroy(&thermal_cdev_idr); |