From c68a766d74881919c4fcd18a7c7b74d3bbbe994e Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Sat, 20 Feb 2010 16:43:02 +0100 Subject: [PATCH] --- yaml --- r: 187089 b: refs/heads/master c: b35c74dab64f4c212f36d868419108556c9cf3e2 h: refs/heads/master i: 187087: 2f7849b30cee836ea490272e00dfeff7edbb7ee8 v: v3 --- [refs] | 2 +- trunk/drivers/macintosh/windfarm_core.c | 1 + trunk/drivers/macintosh/windfarm_smu_controls.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a893f50a3a74..172a361c0411 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 361795b1eb7c08e9e65a2ebb4a4e536294d378a2 +refs/heads/master: b35c74dab64f4c212f36d868419108556c9cf3e2 diff --git a/trunk/drivers/macintosh/windfarm_core.c b/trunk/drivers/macintosh/windfarm_core.c index 437f55c5d18d..419795f4a2aa 100644 --- a/trunk/drivers/macintosh/windfarm_core.c +++ b/trunk/drivers/macintosh/windfarm_core.c @@ -321,6 +321,7 @@ int wf_register_sensor(struct wf_sensor *new_sr) kref_init(&new_sr->ref); list_add(&new_sr->link, &wf_sensors); + sysfs_attr_init(&new_sr->attr.attr); new_sr->attr.attr.name = new_sr->name; new_sr->attr.attr.mode = 0444; new_sr->attr.show = wf_show_sensor; diff --git a/trunk/drivers/macintosh/windfarm_smu_controls.c b/trunk/drivers/macintosh/windfarm_smu_controls.c index 6c68b9e5f5c4..43137b421f92 100644 --- a/trunk/drivers/macintosh/windfarm_smu_controls.c +++ b/trunk/drivers/macintosh/windfarm_smu_controls.c @@ -173,6 +173,7 @@ static struct smu_fan_control *smu_fan_create(struct device_node *node, fct->fan_type = pwm_fan; fct->ctrl.type = pwm_fan ? WF_CONTROL_PWM_FAN : WF_CONTROL_RPM_FAN; + sysfs_attr_init(&fct->ctrl.attr.attr); /* We use the name & location here the same way we do for SMU sensors, * see the comment in windfarm_smu_sensors.c. The locations are a bit