mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-28 06:34:12 +08:00
drivers/thermal/thermal_sys.c: fix 'key f70f4b50 not in .data' in thermal_sys
Initialize sysfs attributes before device_create_file call. Addresses https://bugzilla.kernel.org/show_bug.cgi?id=15548 Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Greg KH <gregkh@suse.de> Cc: Zhang Rui <rui.zhang@intel.com> Cc: Len Brown <len.brown@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
829f46af39
commit
975f8c5653
@ -506,6 +506,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;
|
||||
@ -518,6 +519,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)
|
||||
@ -726,6 +728,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;
|
||||
|
Loading…
Reference in New Issue
Block a user