diff options
| author | Dan Williams | 2015-09-15 08:42:20 +0200 |
|---|---|---|
| committer | Dan Williams | 2015-10-09 23:00:33 +0200 |
| commit | b36f47617f6ce7c5e8e7c264b9d9ea0654d9f20a (patch) | |
| tree | d08894bd10818244ad58444151f201eacc6fa5a7 /kernel/memremap.c | |
| parent | devm_memunmap: use devres_release() (diff) | |
| download | kernel-qcow2-linux-b36f47617f6ce7c5e8e7c264b9d9ea0654d9f20a.tar.gz kernel-qcow2-linux-b36f47617f6ce7c5e8e7c264b9d9ea0654d9f20a.tar.xz kernel-qcow2-linux-b36f47617f6ce7c5e8e7c264b9d9ea0654d9f20a.zip | |
devm_memremap: convert to return ERR_PTR
Make devm_memremap consistent with the error return scheme of
devm_memremap_pages to remove special casing in the pmem driver.
Cc: Christoph Hellwig <hch@lst.de>
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'kernel/memremap.c')
| -rw-r--r-- | kernel/memremap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/memremap.c b/kernel/memremap.c index 0756273437e0..0d818ce04129 100644 --- a/kernel/memremap.c +++ b/kernel/memremap.c @@ -116,7 +116,7 @@ void *devm_memremap(struct device *dev, resource_size_t offset, ptr = devres_alloc(devm_memremap_release, sizeof(*ptr), GFP_KERNEL); if (!ptr) - return NULL; + return ERR_PTR(-ENOMEM); addr = memremap(offset, size, flags); if (addr) { |