Commit 16811f01 authored Dec 03, 2014 by Luis Henriques Committed by Greg Kroah-Hartman Jan 08, 2015

thermal: Fix error path in thermal_init()



commit 9d367e5e7b05c71a8c1ac4e9b6e00ba45a79f2fc upstream.

thermal_unregister_governors() and class_unregister() were being called in
the wrong order.

Fixes: 80a26a5c ("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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 877c27db

drivers/thermal/thermal_core.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);