projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sched: Add group_misfit_task load-balance type
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
memremap.c
diff --git
a/kernel/memremap.c
b/kernel/memremap.c
index 7658d32c5c78aa6343ac8cd669070084d1cd3805..25ced161ebebb1ad58626cba853dc472db8f1caa 100644
(file)
--- a/
kernel/memremap.c
+++ b/
kernel/memremap.c
@@
-111,7
+111,7
@@
EXPORT_SYMBOL(memunmap);
static void devm_memremap_release(struct device *dev, void *res)
{
static void devm_memremap_release(struct device *dev, void *res)
{
- memunmap(res);
+ memunmap(
*(void **)
res);
}
static int devm_memremap_match(struct device *dev, void *res, void *match_data)
}
static int devm_memremap_match(struct device *dev, void *res, void *match_data)
@@
-133,8
+133,10
@@
void *devm_memremap(struct device *dev, resource_size_t offset,
if (addr) {
*ptr = addr;
devres_add(dev, ptr);
if (addr) {
*ptr = addr;
devres_add(dev, ptr);
- } else
+ } else
{
devres_free(ptr);
devres_free(ptr);
+ return ERR_PTR(-ENXIO);
+ }
return addr;
}
return addr;
}