Messages in this thread Patch in this message | | | From | Uwe Kleine-König <> | Subject | [PATCH 3/5] driver core/platform_device_add_resources: set resource to NULL if !res | Date | Wed, 6 Apr 2011 11:24:23 +0200 |
| |
This makes the res = NULL case more consistant to the res != NULL case as now both overwrite pdev->resource.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- drivers/base/platform.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 01caf61..812d8ff 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -191,18 +191,17 @@ EXPORT_SYMBOL_GPL(platform_device_alloc); int platform_device_add_resources(struct platform_device *pdev, const struct resource *res, unsigned int num) { - struct resource *r; + struct resource *r = NULL; - if (!res) - return 0; - - r = kmemdup(res, sizeof(struct resource) * num, GFP_KERNEL); - if (r) { - pdev->resource = r; - pdev->num_resources = num; - return 0; + if (res) { + r = kmemdup(res, sizeof(struct resource) * num, GFP_KERNEL); + if (!r) + return -ENOMEM; } - return -ENOMEM; + + pdev->resource = r; + pdev->num_resources = num; + return 0; } EXPORT_SYMBOL_GPL(platform_device_add_resources); -- 1.7.2.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |