From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751177AbcFNH7i (ORCPT ); Tue, 14 Jun 2016 03:59:38 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:36337 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750760AbcFNH7h (ORCPT ); Tue, 14 Jun 2016 03:59:37 -0400 From: "Vyacheslav V. Yurkov" To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, "Vyacheslav V. Yurkov" Subject: [PATCH] [RESEND] drivers/base dmam_declare_coherent_memory leaks Date: Tue, 14 Jun 2016 09:58:37 +0200 Message-Id: <1465891117-18215-1-git-send-email-uvv.mail@gmail.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <5722283C.60209@gmail.com> References: <5722283C.60209@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- drivers/base/dma-mapping.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/base/dma-mapping.c b/drivers/base/dma-mapping.c index d799662..f5d2132 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; } -- 1.8.4