浏览代码

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>
Greg Kroah-Hartman 10 年之前
父节点
当前提交
0e6c861f73
共有 1 个文件被更改,包括 3 次插入7 次删除
  1. 3 7
      drivers/base/platform.c

+ 3 - 7
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;