---

yaml --- r: 367521 b: refs/heads/master c: f009495 h: refs/heads/master i: 367519: 09e8716 v: v3
git-mirror · Apr 1, 2013 · f63cb83 · f63cb83
1 parent b13e4f3
commit f63cb83
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ec730dc8c697d991b9ba8910cb3f8d985016bec
+refs/heads/master: f0094958d9011d03e688251f8a9510e43a9323f6
diff --git a/trunk/drivers/power/da9052-battery.c b/trunk/drivers/power/da9052-battery.c
@@ -594,7 +594,8 @@ static s32 da9052_bat_probe(struct platform_device *pdev)
 	int ret;
 	int i;
 
-	bat = kzalloc(sizeof(struct da9052_battery), GFP_KERNEL);
+	bat = devm_kzalloc(&pdev->dev, sizeof(struct da9052_battery),
+				GFP_KERNEL);
 	if (!bat)
 		return -ENOMEM;
 
@@ -635,7 +636,6 @@ static s32 da9052_bat_probe(struct platform_device *pdev)
 	while (--i >= 0)
 		da9052_free_irq(bat->da9052, da9052_bat_irq_bits[i], bat);
 
-	kfree(bat);
 	return ret;
 }
 static int da9052_bat_remove(struct platform_device *pdev)
@@ -647,7 +647,6 @@ static int da9052_bat_remove(struct platform_device *pdev)
 		da9052_free_irq(bat->da9052, da9052_bat_irq_bits[i], bat);
 
 	power_supply_unregister(&bat->psy);
-	kfree(bat);
 
 	return 0;
 }