summaryrefslogtreecommitdiff
path: root/drivers/thermal
diff options
context:
space:
mode:
authorRichard Guy Briggs <rbriggs@redhat.com>2013-02-12 19:39:44 +0000
committerZhang Rui <rui.zhang@intel.com>2013-02-22 17:38:40 +0800
commitda28d966f6aa942ae836d09729f76a1647932309 (patch)
tree410375a5ef87b3f578d6fdbad9b94c5bf08f0e85 /drivers/thermal
parent9d185d0417e518fd9cfce90ec2ad75f70771bbaa (diff)
thermal: return an error on failure to register thermal class
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>
Diffstat (limited to 'drivers/thermal')
-rw-r--r--drivers/thermal/thermal_sys.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
index 6472e7e9f969..1a19a2f4ba27 100644
--- a/drivers/thermal/thermal_sys.c
+++ b/drivers/thermal/thermal_sys.c
@@ -1875,6 +1875,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;