diff options
| author | Vyacheslav V. Yurkov <uvv.mail@gmail.com> | 2016-06-14 09:58:37 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-08-31 15:19:55 +0200 |
| commit | 775115c06091fcfa1189a50aca488fa596839617 (patch) | |
| tree | 597917c12f59b657ed1ae8ccc0f612334ea1eccf /drivers/base/dma-mapping.c | |
| parent | platform: don't return 0 from platform_get_irq[_byname]() on error (diff) | |
| download | linux-775115c06091fcfa1189a50aca488fa596839617.tar.xz linux-775115c06091fcfa1189a50aca488fa596839617.zip | |
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>
Diffstat (limited to 'drivers/base/dma-mapping.c')
| -rw-r--r-- | drivers/base/dma-mapping.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/base/dma-mapping.c b/drivers/base/dma-mapping.c index 2e318ffa019e..8f8b68c80986 100644 --- 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; } |