lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
This makes the res = NULL case more consistant to the res != NULL case
as now both overwrite pdev->resource.

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:44 +02:00
committed by Greg Kroah-Hartman
parent 251e031d13
commit cea896238f
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/base/platform.c
View File

@@ -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);