Browse Source

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>
Luis Henriques 10 years ago
parent
commit
9d367e5e7b
1 changed files with 2 additions and 2 deletions
  1. 2 2
      drivers/thermal/thermal_core.c

+ 2 - 2
drivers/thermal/thermal_core.c

@@ -1837,10 +1837,10 @@ static int __init thermal_init(void)
 
 
 exit_netlink:
 exit_netlink:
 	genetlink_exit();
 	genetlink_exit();
-unregister_governors:
-	thermal_unregister_governors();
 unregister_class:
 unregister_class:
 	class_unregister(&thermal_class);
 	class_unregister(&thermal_class);
+unregister_governors:
+	thermal_unregister_governors();
 error:
 error:
 	idr_destroy(&thermal_tz_idr);
 	idr_destroy(&thermal_tz_idr);
 	idr_destroy(&thermal_cdev_idr);
 	idr_destroy(&thermal_cdev_idr);