From 5b606a3fc76c0c0fcc62f588aec60c7c80b26692 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Mon, 28 Nov 2005 10:15:39 -0600 Subject: [PATCH] --- yaml --- r: 16207 b: refs/heads/master c: d960bb4db9f422b5c3c82e0dfd6c8213a4fc430d h: refs/heads/master i: 16205: 50fba7bf0a868fb980c3c441b7d7c6fb7a5329cd 16203: 1636749e52b1e7ec5baa02730e89f2be94a02d59 16199: cbd5933314798ad22bbf7dded67d3d81a737397f 16191: a68d7bcf665f1ad0b0bea7caaa8d282b8388dcd0 v: v3 --- [refs] | 2 +- trunk/drivers/base/platform.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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);