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 коммит произвёл Greg Kroah-Hartman
Родитель 7f100d1566
Коммит 27a33f9e8f
1 изменённых файлов: 8 добавлений и 9 удалений

Просмотреть файл

@ -220,18 +220,17 @@ 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)
return 0;
if (data) {
d = kmemdup(data, size, GFP_KERNEL); d = kmemdup(data, size, GFP_KERNEL);
if (d) { if (!d)
return -ENOMEM;
}
pdev->dev.platform_data = d; pdev->dev.platform_data = d;
return 0; return 0;
} }
return -ENOMEM;
}
EXPORT_SYMBOL_GPL(platform_device_add_data); EXPORT_SYMBOL_GPL(platform_device_add_data);
/** /**