arm64: dts: rockchip: fix pcie and pcie-phy support for rk3399

[firefly-linux-kernel-4.4.55.git] / kernel / memremap.c

diff --git a/kernel/memremap.c b/kernel/memremap.c
index 7a4e473cea4d31b1a51505a51cb1222628decdd9..25ced161ebebb1ad58626cba853dc472db8f1caa 100644 (file)
--- 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;
 }