From 85f211fff06e12b6256be5e70d4c090024607d46 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Tue, 17 Apr 2012 18:06:50 +0800
Subject: [PATCH] --- yaml --- r: 302234 b: refs/heads/master c:
 575f690dc4973027ce7e93360678681d09f65fac h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/regulator/max8660.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0edb6c4f6514..cf9dbdce36a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98d8618af37728f6e18e84110ddb99987b47dd12
+refs/heads/master: 575f690dc4973027ce7e93360678681d09f65fac
diff --git a/trunk/drivers/regulator/max8660.c b/trunk/drivers/regulator/max8660.c
index 9997cfbc3471..5d568175cc27 100644
--- a/trunk/drivers/regulator/max8660.c
+++ b/trunk/drivers/regulator/max8660.c
@@ -370,7 +370,7 @@ static int __devinit max8660_probe(struct i2c_client *client,
 		return -EINVAL;
 	}
 
-	max8660 = kzalloc(sizeof(struct max8660) +
+	max8660 = devm_kzalloc(&client->dev, sizeof(struct max8660) +
 			sizeof(struct regulator_dev *) * MAX8660_V_END,
 			GFP_KERNEL);
 	if (!max8660)