diff --git a/[refs] b/[refs] index 5814de836eac..7b2c62e1afe0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e22dafbcd7a579c29a424d5203b5b33b131948a7 +refs/heads/master: d960bb4db9f422b5c3c82e0dfd6c8213a4fc430d diff --git a/trunk/drivers/base/platform.c b/trunk/drivers/base/platform.c index 8827dafba945..1091af1cbb58 100644 --- a/trunk/drivers/base/platform.c +++ b/trunk/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);