diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2011-04-20 09:44:44 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-23 02:09:13 +0200 |
| commit | cea896238fbfdbce254f51fc8fd78c59df50081f (patch) | |
| tree | 4536217e6a2f43432384e526e962d2240b141c23 /drivers/base | |
| parent | driver core/platform_device_add_data: free platform data before overwriting (diff) | |
| download | linux-cea896238fbfdbce254f51fc8fd78c59df50081f.tar.xz linux-cea896238fbfdbce254f51fc8fd78c59df50081f.zip | |
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: 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>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | 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 58ad8e8ad7a3..667f282f8b7b 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -192,18 +192,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); |