From a69798075865bad7d44cf66d4999a6863ee25e02 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 10 Apr 2013 13:33:24 -0700 Subject: [PATCH] 3.0-stable patches added patches: thermal-return-an-error-on-failure-to-register-thermal-class.patch --- queue-3.0/series | 1 + ...on-failure-to-register-thermal-class.patch | 36 +++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 queue-3.0/thermal-return-an-error-on-failure-to-register-thermal-class.patch diff --git a/queue-3.0/series b/queue-3.0/series index 09f32fd8fbd..74fee36ba01 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -12,3 +12,4 @@ powerpc-pseries_lpar_hpte_remove-fails-from-adjunct-partition-being-performed-be spinlocks-and-preemption-points-need-to-be-at-least-compiler-barriers.patch crypto-gcm-fix-assumption-that-assoc-has-one-segment.patch block-avoid-using-uninitialized-value-in-from-queue_var_store.patch +thermal-return-an-error-on-failure-to-register-thermal-class.patch diff --git a/queue-3.0/thermal-return-an-error-on-failure-to-register-thermal-class.patch b/queue-3.0/thermal-return-an-error-on-failure-to-register-thermal-class.patch new file mode 100644 index 00000000000..2be42f6be16 --- /dev/null +++ b/queue-3.0/thermal-return-an-error-on-failure-to-register-thermal-class.patch @@ -0,0 +1,36 @@ +From da28d966f6aa942ae836d09729f76a1647932309 Mon Sep 17 00:00:00 2001 +From: Richard Guy Briggs +Date: Tue, 12 Feb 2013 19:39:44 +0000 +Subject: thermal: return an error on failure to register thermal class + +From: Richard Guy Briggs + +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 +Signed-off-by: Zhang Rui +Cc: Jonghwan Choi +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/thermal/thermal_sys.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/thermal/thermal_sys.c ++++ b/drivers/thermal/thermal_sys.c +@@ -1319,6 +1319,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; -- 2.47.3