From 42a301939fcd080140b3eac61f551b8927b8b4f0 Mon Sep 17 00:00:00 2001
From: Peter Ujfalusi <peter.ujfalusi@ti.com>
Date: Mon, 10 Sep 2012 13:46:20 +0300
Subject: [PATCH] --- yaml --- r: 329969 b: refs/heads/master c:
 39c1421db694ee2594bbb2196b1b5a3085e3c656 h: refs/heads/master i:   329967:
 11693b88727cf231c49b1f6003a7a2d129fef9e8 v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/mfd/twl4030-audio.c | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 8b841eb25183..6f05a42347f2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41569a16e4e12910e14ce98edea9ef30bd89299b
+refs/heads/master: 39c1421db694ee2594bbb2196b1b5a3085e3c656
diff --git a/trunk/drivers/mfd/twl4030-audio.c b/trunk/drivers/mfd/twl4030-audio.c
index e330dfcc74e5..2ab8a1a96b91 100644
--- a/trunk/drivers/mfd/twl4030-audio.c
+++ b/trunk/drivers/mfd/twl4030-audio.c
@@ -188,7 +188,8 @@ static int __devinit twl4030_audio_probe(struct platform_device *pdev)
 	twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
 					val, TWL4030_REG_APLL_CTL);
 
-	audio = kzalloc(sizeof(struct twl4030_audio), GFP_KERNEL);
+	audio = devm_kzalloc(&pdev->dev, sizeof(struct twl4030_audio),
+			     GFP_KERNEL);
 	if (!audio)
 		return -ENOMEM;
 
@@ -229,22 +230,18 @@ static int __devinit twl4030_audio_probe(struct platform_device *pdev)
 		ret = -ENODEV;
 	}
 
-	if (!ret)
-		return 0;
+	if (ret) {
+		platform_set_drvdata(pdev, NULL);
+		twl4030_audio_dev = NULL;
+	}
 
-	platform_set_drvdata(pdev, NULL);
-	kfree(audio);
-	twl4030_audio_dev = NULL;
 	return ret;
 }
 
 static int __devexit twl4030_audio_remove(struct platform_device *pdev)
 {
-	struct twl4030_audio *audio = platform_get_drvdata(pdev);
-
 	mfd_remove_devices(&pdev->dev);
 	platform_set_drvdata(pdev, NULL);
-	kfree(audio);
 	twl4030_audio_dev = NULL;
 
 	return 0;