A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 03:01:39 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "base/platform: Only insert MEM and IO resources"

Browse source 
This reverts commit 36d4b29260 as it
breaks working machines.

Cc: Rob Herring <[email protected]>
Cc: Ricardo Ribalda Delgado <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
Greg Kroah-Hartman 2015-06-10 08:38:29 -07:00
commit 0e6c861f73
1 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
drivers/base/platform.c
View file

@ -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;