[ 3.5.y.z extended stable ] Patch "thermal: return an error on failure to register thermal class" has been added to staging queue

Luis Henriques luis.henriques at canonical.com
Thu Apr 4 13:26:13 UTC 2013


This is a note to let you know that I have just added a patch titled

    thermal: return an error on failure to register thermal class

to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.5.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Luis

------

>From e1a90e68ac6977fc7d3cb432324d46f9ed0c7998 Mon Sep 17 00:00:00 2001
From: Richard Guy Briggs <rbriggs at redhat.com>
Date: Tue, 12 Feb 2013 19:39:44 +0000
Subject: [PATCH] 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 at redhat.com>
Signed-off-by: Zhang Rui <rui.zhang at intel.com>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 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 022bacb..5c26dda 100644
--- a/drivers/thermal/thermal_sys.c
+++ b/drivers/thermal/thermal_sys.c
@@ -1383,6 +1383,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.8.1.2





More information about the kernel-team mailing list