From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Wed, 20 Apr 2011 07:44:42 +0000 (+0200)
Subject: driver core/platform_device_add_data: set platform_data to NULL if !data
X-Git-Tag: v3.0-rc1~390^2~26
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=27a33f9e8fb203e71925257cf039fe6ec623c5d1;p=karo-tx-linux.git

driver core/platform_device_add_data: set platform_data to NULL if !data

This makes the data = NULL case more consistent to the data != NULL case.
The functional change is that now

	platform_device_add_data(somepdev, NULL, somesize)

sets pdev->dev.platform_data to NULL instead of not touching it.

Reviewed-by: Viresh Kumar <viresh.kumar@st.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 9e0e4fc24c46..65cb4c397603 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -220,17 +220,16 @@ EXPORT_SYMBOL_GPL(platform_device_add_resources);
 int platform_device_add_data(struct platform_device *pdev, const void *data,
 			     size_t size)
 {
-	void *d;
+	void *d = NULL;
 
-	if (!data)
-		return 0;
-
-	d = kmemdup(data, size, GFP_KERNEL);
-	if (d) {
-		pdev->dev.platform_data = d;
-		return 0;
+	if (data) {
+		d = kmemdup(data, size, GFP_KERNEL);
+		if (!d)
+			return -ENOMEM;
 	}
-	return -ENOMEM;
+
+	pdev->dev.platform_data = d;
+	return 0;
 }
 EXPORT_SYMBOL_GPL(platform_device_add_data);