Commit 27a33f9e authored Apr 20, 2011 by Uwe Kleine-König Committed by Greg Kroah-Hartman Apr 22, 2011

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>

parent 7f100d15

drivers/base/platform.c

+8 −9

Original line number	Diff line number	Diff line
		@@ -220,18 +220,17 @@ EXPORT_SYMBOL_GPL(platform_device_add_resources);
		int platform_device_add_data(struct platform_device pdev, const void data,
		size_t size)
		{
		void *d;

		if (!data)
		return 0;
		void *d = NULL;

		if (data) {
		d = kmemdup(data, size, GFP_KERNEL);
		if (d) {
		if (!d)
		return -ENOMEM;
		}

		pdev->dev.platform_data = d;
		return 0;
		}
		return -ENOMEM;
		}
		EXPORT_SYMBOL_GPL(platform_device_add_data);

		/**

Admin message