dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Uwe Kleine-König 2011-04-20 09:44:42 +02:00 committed by Greg Kroah-Hartman
parent 7f100d1566
commit 27a33f9e8f
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/base/platform.c
View File

@ -220,17 +220,16 @@ EXPORT_SYMBOL_GPL(platform_device_add_resources);
int platform_device_add_data(struct platform_device *pdev, const void *data, int platform_device_add_data(struct platform_device *pdev, const void *data,
size_t size) size_t size)
{ {
void *d; void *d = NULL;
if (!data) if (data) {
return 0; d = kmemdup(data, size, GFP_KERNEL);
if (!d)
d = kmemdup(data, size, GFP_KERNEL); return -ENOMEM;
if (d) {
pdev->dev.platform_data = d;
return 0;
} }
return -ENOMEM;
pdev->dev.platform_data = d;
return 0;
} }
EXPORT_SYMBOL_GPL(platform_device_add_data); EXPORT_SYMBOL_GPL(platform_device_add_data);