diff options
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/devres.c | 4 | ||||
| -rw-r--r-- | drivers/base/node.c | 10 | ||||
| -rw-r--r-- | drivers/base/platform.c | 8 |
3 files changed, 14 insertions, 8 deletions
diff --git a/drivers/base/devres.c b/drivers/base/devres.c index 545c4de412c3..cbe0b58bab3c 100644 --- a/drivers/base/devres.c +++ b/drivers/base/devres.c @@ -297,10 +297,10 @@ void * devres_get(struct device *dev, void *new_res, if (!dr) { add_dr(dev, &new_dr->node); dr = new_dr; - new_dr = NULL; + new_res = NULL; } spin_unlock_irqrestore(&dev->devres_lock, flags); - devres_free(new_dr); + devres_free(new_res); return dr->data; } diff --git a/drivers/base/node.c b/drivers/base/node.c index bc9f43bf7e29..5f5160c9455f 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -399,6 +399,16 @@ int register_mem_sect_under_node(struct memory_block *mem_blk, int nid) for (pfn = sect_start_pfn; pfn <= sect_end_pfn; pfn++) { int page_nid; + /* + * memory block could have several absent sections from start. + * skip pfn range from absent section + */ + if (!pfn_present(pfn)) { + pfn = round_down(pfn + PAGES_PER_SECTION, + PAGES_PER_SECTION) - 1; + continue; + } + page_nid = get_nid_for_pfn(pfn); if (page_nid < 0) continue; diff --git a/drivers/base/platform.c b/drivers/base/platform.c index e988313ece30..946d32dc347c 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -354,9 +354,7 @@ int platform_device_add(struct platform_device *pdev) 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); } @@ -387,9 +385,7 @@ void platform_device_del(struct platform_device *pdev) 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); } } |