p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "base/platform: Continue on insert_resource() error" 

This reverts commit e50e69d1ac as it
breaks working machines.

Cc: Rob Herring <robh@kernel.org>
Cc: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2015-06-10 08:38:02 -07:00
parent 8171d5f7bf
commit 5da7f70997
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/base/platform.c
View File

@ -332,7 +332,7 @@ int platform_device_add(struct platform_device *pdev)
*/ */
ret = ida_simple_get(&platform_devid_ida, 0, 0, GFP_KERNEL); ret = ida_simple_get(&platform_devid_ida, 0, 0, GFP_KERNEL);
if (ret < 0) if (ret < 0)
return ret; goto err_out;
pdev->id = ret; pdev->id = ret;
pdev->id_auto = true; pdev->id_auto = true;
dev_set_name(&pdev->dev, "%s.%d.auto", pdev->name, pdev->id); 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++) { for (i = 0; i < pdev->num_resources; i++) {
struct resource *conflict, *p, *r = &pdev->resource[i]; struct resource *p, *r = &pdev->resource[i];
unsigned long type = resource_type(r); unsigned long type = resource_type(r);
if (r->name == NULL) if (r->name == NULL)
@ -357,14 +357,11 @@ int platform_device_add(struct platform_device *pdev)
p = &ioport_resource; p = &ioport_resource;
} }
conflict = insert_resource_conflict(p, r); if (insert_resource(p, r)) {
if (!conflict) dev_err(&pdev->dev, "failed to claim resource %d\n", i);
continue; ret = -EBUSY;
goto failed;
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", pr_debug("Registering platform device '%s'. Parent at %s\n",
@ -374,7 +371,7 @@ int platform_device_add(struct platform_device *pdev)
if (ret == 0) if (ret == 0)
return ret; return ret;
/* Failure path */ failed:
if (pdev->id_auto) { if (pdev->id_auto) {
ida_simple_remove(&platform_devid_ida, pdev->id); ida_simple_remove(&platform_devid_ida, pdev->id);
pdev->id = PLATFORM_DEVID_AUTO; pdev->id = PLATFORM_DEVID_AUTO;
@ -384,11 +381,11 @@ int platform_device_add(struct platform_device *pdev)
struct resource *r = &pdev->resource[i]; struct resource *r = &pdev->resource[i];
unsigned long type = resource_type(r); 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); release_resource(r);
} }
err_out:
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(platform_device_add); EXPORT_SYMBOL_GPL(platform_device_add);
@ -417,8 +414,7 @@ void platform_device_del(struct platform_device *pdev)
struct resource *r = &pdev->resource[i]; struct resource *r = &pdev->resource[i];
unsigned long type = resource_type(r); 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); release_resource(r);
} }
} }