X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=kernel%2Fmemremap.c;h=25ced161ebebb1ad58626cba853dc472db8f1caa;hb=d04a2e0a163df2f96de93c7c5c5fc8c6d41268e8;hp=7a4e473cea4d31b1a51505a51cb1222628decdd9;hpb=582ee3a96f6a108f589bdc4ce8cc8176c8d763e5;p=firefly-linux-kernel-4.4.55.git

diff --git a/kernel/memremap.c b/kernel/memremap.c
index 7a4e473cea4d..25ced161ebeb 100644
--- a/kernel/memremap.c
+++ b/kernel/memremap.c
@@ -133,8 +133,10 @@ void *devm_memremap(struct device *dev, resource_size_t offset,
 	if (addr) {
 		*ptr = addr;
 		devres_add(dev, ptr);
-	} else
+	} else {
 		devres_free(ptr);
+		return ERR_PTR(-ENXIO);
+	}
 
 	return addr;
 }