aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base/platform.c
diff options
context:
space:
mode:
authorKumar Gala <galak@gate.crashing.org>2005-11-28 11:15:39 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2006-01-04 19:18:08 -0500
commitd960bb4db9f422b5c3c82e0dfd6c8213a4fc430d (patch)
treea5d79803da3f7e20fa55f6fd1b8ec9c74ef0c322 /drivers/base/platform.c
parente22dafbcd7a579c29a424d5203b5b33b131948a7 (diff)
[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/base/platform.c')
-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 8827dafba945..1091af1cbb58 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -257,7 +257,7 @@ int platform_device_add(struct platform_device *pdev)
257 p = &ioport_resource; 257 p = &ioport_resource;
258 } 258 }
259 259
260 if (p && request_resource(p, r)) { 260 if (p && insert_resource(p, r)) {
261 printk(KERN_ERR 261 printk(KERN_ERR
262 "%s: failed to claim resource %d\n", 262 "%s: failed to claim resource %d\n",
263 pdev->dev.bus_id, i); 263 pdev->dev.bus_id, i);