diff options
| -rw-r--r-- | drivers/base/platform.c | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 46a56f6..5a29387 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -332,7 +332,7 @@ int platform_device_add(struct platform_device *pdev) */ ret = ida_simple_get(&platform_devid_ida, 0, 0, GFP_KERNEL); if (ret < 0) - goto err_out; + return ret; pdev->id = ret; pdev->id_auto = true; dev_set_name(&pdev->dev, "%s.%d.auto", pdev->name, pdev->id); @@ -340,7 +340,7 @@ int platform_device_add(struct platform_device *pdev) } for (i = 0; i < pdev->num_resources; i++) { - struct resource *p, *r = &pdev->resource[i]; + struct resource *conflict, *p, *r = &pdev->resource[i]; unsigned long type = resource_type(r); if (r->name == NULL) @@ -357,11 +357,14 @@ int platform_device_add(struct platform_device *pdev) p = &ioport_resource; } - if (insert_resource(p, r)) { - dev_err(&pdev->dev, "failed to claim resource %d\n", i); - ret = -EBUSY; - goto failed; - } + conflict = insert_resource_conflict(p, r); + if (!conflict) + continue; + + dev_err(&pdev->dev, + "ignoring resource %pR (conflicts with %s %pR)\n", + r, conflict->name, conflict); + p->parent = NULL; } pr_debug("Registering platform device '%s'. Parent at %s\n", @@ -371,7 +374,7 @@ int platform_device_add(struct platform_device *pdev) if (ret == 0) return ret; - failed: + /* Failure path */ if (pdev->id_auto) { ida_simple_remove(&platform_devid_ida, pdev->id); pdev->id = PLATFORM_DEVID_AUTO; @@ -381,11 +384,11 @@ int platform_device_add(struct platform_device *pdev) struct resource *r = &pdev->resource[i]; unsigned long type = resource_type(r); - if (type == IORESOURCE_MEM || type == IORESOURCE_IO) + if ((type == IORESOURCE_MEM || type == IORESOURCE_IO) && + r->parent) release_resource(r); } - err_out: return ret; } EXPORT_SYMBOL_GPL(platform_device_add); @@ -414,7 +417,8 @@ void platform_device_del(struct platform_device *pdev) struct resource *r = &pdev->resource[i]; unsigned long type = resource_type(r); - if (type == IORESOURCE_MEM || type == IORESOURCE_IO) + if ((type == IORESOURCE_MEM || type == IORESOURCE_IO) && + r->parent) release_resource(r); } } |
