| Date | Mon, 06 May 2013 23:57:44 -0400 | From | Steven Rostedt <> | Subject | [032/126] thermal: return an error on failure to register thermal class |
| |
3.6.11.3 stable review patch. If anyone has any objections, please let me know.
------------------
From: Richard Guy Briggs <rbriggs@redhat.com>
[ Upstream commit da28d966f6aa942ae836d09729f76a1647932309 ]
The return code from the registration of the thermal class is used to unallocate resources, but this failure isn't passed back to the caller of thermal_init. Return this failure back to the caller.
This bug was introduced in changeset 4cb18728 which overwrote the return code when the variable was re-used to catch the return code of the registration of the genetlink thermal socket family.
Signed-off-by: Richard Guy Briggs <rbriggs@redhat.com> Signed-off-by: Zhang Rui <rui.zhang@intel.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org> --- drivers/thermal/thermal_sys.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c index 2ab31e4..03d203f 100644 --- a/drivers/thermal/thermal_sys.c +++ b/drivers/thermal/thermal_sys.c @@ -1518,6 +1518,7 @@ static int __init thermal_init(void) idr_destroy(&thermal_cdev_idr); mutex_destroy(&thermal_idr_lock); mutex_destroy(&thermal_list_lock); + return result; } result = genetlink_init(); return result; -- 1.7.10.4
|