diff --git a/[refs] b/[refs]
index a5522fe27ee0..20c4e5cbeff9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b00fc5851551781e8a30153af2c94cee9fa84af
+refs/heads/master: 54d29ad33e3483bcc7ca433a21cf294854e5154a
diff --git a/trunk/drivers/power/power_supply_core.c b/trunk/drivers/power/power_supply_core.c
index 138dd76ee347..af1633eb3b70 100644
--- a/trunk/drivers/power/power_supply_core.c
+++ b/trunk/drivers/power/power_supply_core.c
@@ -91,15 +91,13 @@ int power_supply_register(struct device *parent, struct power_supply *psy)
 {
 	int rc = 0;
 
-	psy->dev = device_create(power_supply_class, parent, 0,
-				 "%s", psy->name);
+	psy->dev = device_create_drvdata(power_supply_class, parent, 0,
+					 psy, "%s", psy->name);
 	if (IS_ERR(psy->dev)) {
 		rc = PTR_ERR(psy->dev);
 		goto dev_create_failed;
 	}
 
-	dev_set_drvdata(psy->dev, psy);
-
 	INIT_WORK(&psy->changed_work, power_supply_changed_work);
 
 	rc = power_supply_create_attrs(psy);