drivers/base dmam_declare_coherent_memory leaks

dmam_declare_coherent_memory doesn't take into account the return
value of dma_declare_coherent_memory, which leads to incorrect resource
handling

Signed-off-by: Vyacheslav V. Yurkov <uvv.mail@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/base/dma-mapping.c b/drivers/base/dma-mapping.c
index 2e318ffa019efa1eb16c64bb5153686951a9302c..8f8b68c80986cf35fa89ead7914e8f185aa34bd2 100644 (file)
--- a/drivers/base/dma-mapping.c
+++ b/drivers/base/dma-mapping.c
@@ -198,10 +198,13 @@ int dmam_declare_coherent_memory(struct device *dev, phys_addr_t phys_addr,
 
        rc = dma_declare_coherent_memory(dev, phys_addr, device_addr, size,
                                         flags);
-       if (rc == 0)
+       if (rc) {
                devres_add(dev, res);
-       else
+               rc = 0;
+       } else {
                devres_free(res);
+               rc = -ENOMEM;
+       }
 
        return rc;
 }