aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/power_supply_core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
index 970f7335d3a7..329b46b2327d 100644
--- a/drivers/power/power_supply_core.c
+++ b/drivers/power/power_supply_core.c
@@ -171,6 +171,8 @@ int power_supply_register(struct device *parent, struct power_supply *psy)
171 dev_set_drvdata(dev, psy); 171 dev_set_drvdata(dev, psy);
172 psy->dev = dev; 172 psy->dev = dev;
173 173
174 INIT_WORK(&psy->changed_work, power_supply_changed_work);
175
174 rc = kobject_set_name(&dev->kobj, "%s", psy->name); 176 rc = kobject_set_name(&dev->kobj, "%s", psy->name);
175 if (rc) 177 if (rc)
176 goto kobject_set_name_failed; 178 goto kobject_set_name_failed;
@@ -179,8 +181,6 @@ int power_supply_register(struct device *parent, struct power_supply *psy)
179 if (rc) 181 if (rc)
180 goto device_add_failed; 182 goto device_add_failed;
181 183
182 INIT_WORK(&psy->changed_work, power_supply_changed_work);
183
184 rc = power_supply_create_triggers(psy); 184 rc = power_supply_create_triggers(psy);
185 if (rc) 185 if (rc)
186 goto create_triggers_failed; 186 goto create_triggers_failed;