Commit cea89623 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Greg Kroah-Hartman

driver core/platform_device_add_resources: set resource to NULL if !res

This makes the res = NULL case more consistant to the res != NULL case
as now both overwrite pdev->resource.
Reviewed-by: default avatarViresh Kumar <viresh.kumar@st.com>
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 251e031d
...@@ -192,18 +192,17 @@ EXPORT_SYMBOL_GPL(platform_device_alloc); ...@@ -192,18 +192,17 @@ EXPORT_SYMBOL_GPL(platform_device_alloc);
int platform_device_add_resources(struct platform_device *pdev, int platform_device_add_resources(struct platform_device *pdev,
const struct resource *res, unsigned int num) const struct resource *res, unsigned int num)
{ {
struct resource *r; struct resource *r = NULL;
if (!res) if (res) {
return 0; r = kmemdup(res, sizeof(struct resource) * num, GFP_KERNEL);
if (!r)
r = kmemdup(res, sizeof(struct resource) * num, GFP_KERNEL); return -ENOMEM;
if (r) {
pdev->resource = r;
pdev->num_resources = num;
return 0;
} }
return -ENOMEM;
pdev->resource = r;
pdev->num_resources = num;
return 0;
} }
EXPORT_SYMBOL_GPL(platform_device_add_resources); EXPORT_SYMBOL_GPL(platform_device_add_resources);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment