Browse Source

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>
Vyacheslav V. Yurkov 9 years ago
parent
commit
775115c060
1 changed files with 5 additions and 2 deletions
  1. 5 2
      drivers/base/dma-mapping.c

+ 5 - 2
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,
 	rc = dma_declare_coherent_memory(dev, phys_addr, device_addr, size,
 					 flags);
 					 flags);
-	if (rc == 0)
+	if (rc) {
 		devres_add(dev, res);
 		devres_add(dev, res);
-	else
+		rc = 0;
+	} else {
 		devres_free(res);
 		devres_free(res);
+		rc = -ENOMEM;
+	}
 
 
 	return rc;
 	return rc;
 }
 }