summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorKumar Gala <galak@gate.crashing.org>2005-11-28 16:15:39 (GMT)
committerGreg Kroah-Hartman <gregkh@suse.de>2006-01-05 00:18:08 (GMT)
commitd960bb4db9f422b5c3c82e0dfd6c8213a4fc430d (patch)
treea5d79803da3f7e20fa55f6fd1b8ec9c74ef0c322 /drivers
parente22dafbcd7a579c29a424d5203b5b33b131948a7 (diff)
downloadlinux-d960bb4db9f422b5c3c82e0dfd6c8213a4fc430d.tar.xz
[PATCH] Allow overlapping resources for platform devices
There are cases in which a device's memory mapped registers overlap with another device's memory mapped registers. On several PowerPC devices this occurs for the MDIO bus, whose registers tended to overlap with one of the ethernet controllers. By switching from request_resource to insert_resource we can register the MDIO bus as a proper platform device and not hack around how we handle its memory mapped registers. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/base/platform.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 8827daf..1091af1 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -257,7 +257,7 @@ int platform_device_add(struct platform_device *pdev)
p = &ioport_resource;
}
- if (p && request_resource(p, r)) {
+ if (p && insert_resource(p, r)) {
printk(KERN_ERR
"%s: failed to claim resource %d\n",
pdev->dev.bus_id, i);