Commit 775115c0 authored Jun 14, 2016 by Vyacheslav V. Yurkov Committed by Greg Kroah-Hartman Aug 31, 2016

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>

parent e330b9a6

drivers/base/dma-mapping.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}