summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-06-10 08:38:29 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-06-10 08:38:29 -0700
commit0e6c861f73ec42ab5c89fda9892f2173c7aaf6cf (patch)
treeb24c500276a9dd4058387b09a6f36402f61b2fa2 /drivers/base
parent5da7f70997f772d7605c11d9e00018ffac463d92 (diff)
downloadblackbird-op-linux-0e6c861f73ec42ab5c89fda9892f2173c7aaf6cf.tar.gz
blackbird-op-linux-0e6c861f73ec42ab5c89fda9892f2173c7aaf6cf.zip
Revert "base/platform: Only insert MEM and IO resources"
This reverts commit 36d4b29260753ad78b1ce4363145332c02519adc 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>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/platform.c10
1 files changed, 3 insertions, 7 deletions
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;
OpenPOWER on IntegriCloud