aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/thermal
diff options
context:
space:
mode:
authorRichard Guy Briggs <rbriggs@redhat.com>2013-02-12 19:39:44 +0000
committerBen Hutchings <ben@decadent.org.uk>2013-04-25 20:25:43 +0100
commit2f0500f50b8ee7b33407d74f00f5f17ac1d1473e (patch)
treeda3a478ee01c96e28e707b8a63ffcf3a7d7c6b71 /drivers/thermal
parent5428146ebea24b916eb9e3684449699cb6a5c8c0 (diff)
downloadkernel_samsung_smdk4412-2f0500f50b8ee7b33407d74f00f5f17ac1d1473e.zip
kernel_samsung_smdk4412-2f0500f50b8ee7b33407d74f00f5f17ac1d1473e.tar.gz
kernel_samsung_smdk4412-2f0500f50b8ee7b33407d74f00f5f17ac1d1473e.tar.bz2
thermal: return an error on failure to register thermal class
commit da28d966f6aa942ae836d09729f76a1647932309 upstream. 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: Ben Hutchings <ben@decadent.org.uk>
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 dd9a574..f6fb292 100644
--- a/drivers/thermal/thermal_sys.c
+++ b/drivers/thermal/thermal_sys.c
@@ -1399,6 +1399,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;