diff --git a/[refs] b/[refs]
index 993c0301ea3a..b34927cb1548 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc67ea8e92d45d1237e289fd1c1ec004a8383ccc
+refs/heads/master: feeb3a92b1f4e4b53bbad2b1c0d0eb1bcdd6d5a7
diff --git a/trunk/drivers/power/max8925_power.c b/trunk/drivers/power/max8925_power.c
index 665cdc76c265..0ee1e14f76e9 100644
--- a/trunk/drivers/power/max8925_power.c
+++ b/trunk/drivers/power/max8925_power.c
@@ -489,7 +489,8 @@ static int max8925_power_probe(struct platform_device *pdev)
 		return -EINVAL;
 	}
 
-	info = kzalloc(sizeof(struct max8925_power_info), GFP_KERNEL);
+	info = devm_kzalloc(&pdev->dev, sizeof(struct max8925_power_info),
+				GFP_KERNEL);
 	if (!info)
 		return -ENOMEM;
 	info->chip = chip;
@@ -546,7 +547,6 @@ static int max8925_power_probe(struct platform_device *pdev)
 out_usb:
 	power_supply_unregister(&info->ac);
 out:
-	kfree(info);
 	return ret;
 }
 
@@ -559,7 +559,6 @@ static int max8925_power_remove(struct platform_device *pdev)
 		power_supply_unregister(&info->usb);
 		power_supply_unregister(&info->battery);
 		max8925_deinit_charger(info);
-		kfree(info);
 	}
 	return 0;
 }