From e71d85f190c40d3484c0852f0e59599768767e32 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Tue, 24 Aug 2010 13:44:05 +0800
Subject: [PATCH] --- yaml --- r: 220582 b: refs/heads/master c:
 b59cedeffaef54dd091baf01fd5e276ac50a3176 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/mfd/da903x.c | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 285f7edd0a7b..389c38aa54bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c36af7b57540ea52d74dbbe71bf860aca910bb9
+refs/heads/master: b59cedeffaef54dd091baf01fd5e276ac50a3176
diff --git a/trunk/drivers/mfd/da903x.c b/trunk/drivers/mfd/da903x.c
index c07aece900fb..2fadbaeb1cb1 100644
--- a/trunk/drivers/mfd/da903x.c
+++ b/trunk/drivers/mfd/da903x.c
@@ -470,13 +470,19 @@ static int __devinit da903x_add_subdevs(struct da903x_chip *chip,
 		subdev = &pdata->subdevs[i];
 
 		pdev = platform_device_alloc(subdev->name, subdev->id);
+		if (!pdev) {
+			ret = -ENOMEM;
+			goto failed;
+		}
 
 		pdev->dev.parent = chip->dev;
 		pdev->dev.platform_data = subdev->platform_data;
 
 		ret = platform_device_add(pdev);
-		if (ret)
+		if (ret) {
+			platform_device_put(pdev);
 			goto failed;
+		}
 	}
 	return 0;