From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 69FC1C33CB6 for ; Thu, 16 Jan 2020 17:32:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 35ED9246A3 for ; Thu, 16 Jan 2020 17:32:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579195932; bh=IynIyZlOpHNsyfe6Xr9KG2ZZwvU4VlMDgYpAwdi/G7Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BoGrX5Df2+clEFBmeO6W3Hgh9d2NR8/P0by6wz/p36rZwgV1HI2me3WcsryaC88E5 Wis/dOrebE8xwP6j+4qcZFC2NqZ3DPBUApJo8iFIvwyJWT0oNjIKfS2rDE2NYPh567 pgf6U505eydUqToq1JHGtyksKLeqR+HfchtN2aMY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404688AbgAPRbF (ORCPT ); Thu, 16 Jan 2020 12:31:05 -0500 Received: from mail.kernel.org ([198.145.29.99]:44002 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404683AbgAPRbE (ORCPT ); Thu, 16 Jan 2020 12:31:04 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4EA04246B1; Thu, 16 Jan 2020 17:31:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579195864; bh=IynIyZlOpHNsyfe6Xr9KG2ZZwvU4VlMDgYpAwdi/G7Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j5KAFtZRAH8AOW3v2v8k6GsMtj4a2OZ/OIq3iIEtwNGbA+guyL3FnQDycOCKyhRDH tD2AF83sDcyY4o+iD1oPtQC+BVxN8PD0YqrImBioy+8vTsg79HxR+aBmEBysDfMOpI iJHmTHZv2lzm5zObgulyLyjvhy2D7XUPq0yBtx4A= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chuhong Yuan , Vinod Koul , Sasha Levin , dmaengine@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 361/371] dmaengine: ti: edma: fix missed failure handling Date: Thu, 16 Jan 2020 12:23:53 -0500 Message-Id: <20200116172403.18149-304-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116172403.18149-1-sashal@kernel.org> References: <20200116172403.18149-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org From: Chuhong Yuan [ Upstream commit 340049d453682a9fe8d91fe794dd091730f4bb25 ] When devm_kcalloc fails, it forgets to call edma_free_slot. Replace direct return with failure handler to fix it. Fixes: 1be5336bc7ba ("dmaengine: edma: New device tree binding") Signed-off-by: Chuhong Yuan Link: https://lore.kernel.org/r/20191118073802.28424-1-hslester96@gmail.com Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/edma.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index 519c24465dea..57a49fe713fd 100644 --- a/drivers/dma/edma.c +++ b/drivers/dma/edma.c @@ -2340,8 +2340,10 @@ static int edma_probe(struct platform_device *pdev) ecc->tc_list = devm_kcalloc(dev, ecc->num_tc, sizeof(*ecc->tc_list), GFP_KERNEL); - if (!ecc->tc_list) - return -ENOMEM; + if (!ecc->tc_list) { + ret = -ENOMEM; + goto err_reg1; + } for (i = 0;; i++) { ret = of_parse_phandle_with_fixed_args(node, "ti,tptcs", -- 2.20.1