diff options
| author | Luis Henriques <luis.henriques@canonical.com> | 2014-12-03 21:20:21 +0000 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-06-05 15:42:07 -0700 |
| commit | 8ead86710c69cc91f84e0e9b5fa260d8063fea51 (patch) | |
| tree | ba74157ff6fec57435bc3c608ffade7c9a5e4d45 /drivers/thermal/thermal_core.c | |
| parent | 2565094fbf51d60bf7cc78f0c6960d27799e7c35 (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>
(cherry picked from commit 9d367e5e7b05c71a8c1ac4e9b6e00ba45a79f2fc)
Signed-off-by: Kevin Hilman <khilman@linaro.org>
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) 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); |