diff options
| author | Luis Henriques <luis.henriques@canonical.com> | 2014-12-03 21:20:21 +0000 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-01-07 17:55:08 +0100 |
| commit | f7c68a1aa5d3bf2e94c548c8d77de50640a11209 (patch) | |
| tree | cdceb6b61b1d769c5c28179df571f7bb764d6c43 | |
| parent | d5c70d8fdcea383449a4ca6b25e3ec16d73e83ba (diff) | |
thermal: Fix error path in thermal_init()
commit 9d367e5e7b05c71a8c1ac4e9b6e00ba45a79f2fc upstream.
thermal_unregister_governors() and class_unregister() were being called in
the wrong order.
Fixes: 80a26a5c22b9 ("Thermal: build thermal governors into thermal_sys module")
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -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 4962a6aaf295..4f35f1ca3ce3 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -1747,10 +1747,10 @@ static int __init thermal_init(void) return 0; -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); |