summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver O'Halloran <oohall@gmail.com>2018-03-06 15:56:47 +1100
committerDan Williams <dan.j.williams@intel.com>2018-03-06 10:58:54 -0800
commit167f5594b5efa20a26ff03b3424f793887e6b448 (patch)
tree96dce5f3cf0b223f1e722419ddfec116ddeb2b5f
parent661e50bc853209e41a5c14a290ca4decc43cbfd1 (diff)
downloadlinux-167f5594b5efa20a26ff03b3424f793887e6b448.tar.bz2
kernel/memremap: Remove stale devres_free() call
devm_memremap_pages() was re-worked in e8d513483300 "memremap: change devm_memremap_pages interface to use struct dev_pagemap" to take a caller allocated struct dev_pagemap as a function parameter. A call to devres_free() was left in the error cleanup path which results in a kernel panic if the remap fails for some reason. Remove it to fix the panic and let devm_memremap_pages() fail gracefully. Fixes: e8d513483300 ("memremap: change devm_memremap_pages interface...") Signed-off-by: Oliver O'Halloran <oohall@gmail.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Logan Gunthorpe <logang@deltatee.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
-rw-r--r--kernel/memremap.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/memremap.c b/kernel/memremap.c
index 4dd4274cabe2..895e6b76b25e 100644
--- a/kernel/memremap.c
+++ b/kernel/memremap.c
@@ -427,7 +427,6 @@ void *devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap)
err_pfn_remap:
err_radix:
pgmap_radix_release(res, pgoff);
- devres_free(pgmap);
return ERR_PTR(error);
}
EXPORT_SYMBOL(devm_memremap_pages);