From 0e6c861f73ec42ab5c89fda9892f2173c7aaf6cf Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 10 Jun 2015 08:38:29 -0700 Subject: Revert "base/platform: Only insert MEM and IO resources" This reverts commit 36d4b29260753ad78b1ce4363145332c02519adc as it breaks working machines. Cc: Rob Herring Cc: Ricardo Ribalda Delgado Signed-off-by: Greg Kroah-Hartman --- drivers/base/platform.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'drivers/base/platform.c') diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 46a56f694cec..063f0ab15259 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -341,23 +341,19 @@ int platform_device_add(struct platform_device *pdev) for (i = 0; i < pdev->num_resources; i++) { struct resource *p, *r = &pdev->resource[i]; - unsigned long type = resource_type(r); if (r->name == NULL) r->name = dev_name(&pdev->dev); - if (!(type == IORESOURCE_MEM || type == IORESOURCE_IO)) - continue; - p = r->parent; if (!p) { - if (type == IORESOURCE_MEM) + if (resource_type(r) == IORESOURCE_MEM) p = &iomem_resource; - else if (type == IORESOURCE_IO) + else if (resource_type(r) == IORESOURCE_IO) p = &ioport_resource; } - if (insert_resource(p, r)) { + if (p && insert_resource(p, r)) { dev_err(&pdev->dev, "failed to claim resource %d\n", i); ret = -EBUSY; goto failed; -- cgit v1.2.3