diff --git a/[refs] b/[refs]
index b01ed45ea6d5..98d976932814 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f722e17fdb2c97bbec2563636dd88489cdb1428b
+refs/heads/master: 97774672573ac4355bd12cf84b202555c1131b69
diff --git a/trunk/drivers/power/power_supply_core.c b/trunk/drivers/power/power_supply_core.c
index 970f7335d3a7..329b46b2327d 100644
--- a/trunk/drivers/power/power_supply_core.c
+++ b/trunk/drivers/power/power_supply_core.c
@@ -171,6 +171,8 @@ int power_supply_register(struct device *parent, struct power_supply *psy)
 	dev_set_drvdata(dev, psy);
 	psy->dev = dev;
 
+	INIT_WORK(&psy->changed_work, power_supply_changed_work);
+
 	rc = kobject_set_name(&dev->kobj, "%s", psy->name);
 	if (rc)
 		goto kobject_set_name_failed;
@@ -179,8 +181,6 @@ int power_supply_register(struct device *parent, struct power_supply *psy)
 	if (rc)
 		goto device_add_failed;
 
-	INIT_WORK(&psy->changed_work, power_supply_changed_work);
-
 	rc = power_supply_create_triggers(psy);
 	if (rc)
 		goto create_triggers_failed;