[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20100322135235.GA3388@swordfish.minsk.epam.com>
Date: Mon, 22 Mar 2010 15:52:35 +0200
From: Sergey Senozhatsky <sergey.senozhatsky@...il.com>
To: Greg KH <gregkh@...e.de>
Cc: Wolfram Sang <w.sang@...gutronix.de>,
"Eric W. Biederman" <ebiederm@...ssion.com>,
linux-acpi@...r.kernel.org, linux-kernel@...r.kernel.org,
Lin Ming <ming.m.lin@...el.com>, Len Brown <lenb@...nel.org>
Subject: [PATCH] Fix key f70f4b50 not in .data in thermal_sys
Nope. Sorry, I didn't test carefully. Oh, Monday...
Proposed patch doesn't fix the problem. The given below
patch does.
Note that thermal_zone_bind_cooling_device part was proposed by
Wolfram Sang here:
https://patchwork.kernel.org/patch/87359/
So, Wolfram, we need to cooperate to solve the problem.
Initialize sysfs attributes before device_create_file call.
Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@...il.com>
---
diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
index 5066de5..ecb181d 100644
--- a/drivers/thermal/thermal_sys.c
+++ b/drivers/thermal/thermal_sys.c
@@ -505,6 +505,7 @@ thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
tz->temp_input.attr.attr.name = tz->temp_input.name;
tz->temp_input.attr.attr.mode = 0444;
tz->temp_input.attr.show = temp_input_show;
+ sysfs_attr_init(&tz->temp_input.attr.attr);
result = device_create_file(hwmon->device, &tz->temp_input.attr);
if (result)
goto unregister_hwmon_device;
@@ -517,6 +518,7 @@ thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
tz->temp_crit.attr.attr.name = tz->temp_crit.name;
tz->temp_crit.attr.attr.mode = 0444;
tz->temp_crit.attr.show = temp_crit_show;
+ sysfs_attr_init(&tz->temp_crit.attr.attr);
result = device_create_file(hwmon->device,
&tz->temp_crit.attr);
if (result)
@@ -725,6 +727,7 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz,
goto release_idr;
sprintf(dev->attr_name, "cdev%d_trip_point", dev->id);
+ sysfs_attr_init(&dev->attr.attr);
dev->attr.attr.name = dev->attr_name;
dev->attr.attr.mode = 0444;
dev->attr.show = thermal_cooling_device_trip_point_show;
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists