git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
isa: Call isa_bus_init before dependent ISA bus drivers register
[pandora-kernel.git]
/
drivers
/
base
/
platform.c
diff --git
a/drivers/base/platform.c
b/drivers/base/platform.c
index
7a24895
..
ba8f361
100644
(file)
--- a/
drivers/base/platform.c
+++ b/
drivers/base/platform.c
@@
-311,9
+311,7
@@
int platform_device_add(struct platform_device *pdev)
failed:
while (--i >= 0) {
struct resource *r = &pdev->resource[i];
failed:
while (--i >= 0) {
struct resource *r = &pdev->resource[i];
- unsigned long type = resource_type(r);
-
- if (type == IORESOURCE_MEM || type == IORESOURCE_IO)
+ if (r->parent)
release_resource(r);
}
release_resource(r);
}
@@
-338,9
+336,7
@@
void platform_device_del(struct platform_device *pdev)
for (i = 0; i < pdev->num_resources; i++) {
struct resource *r = &pdev->resource[i];
for (i = 0; i < pdev->num_resources; i++) {
struct resource *r = &pdev->resource[i];
- unsigned long type = resource_type(r);
-
- if (type == IORESOURCE_MEM || type == IORESOURCE_IO)
+ if (r->parent)
release_resource(r);
}
}
release_resource(r);
}
}