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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 4B26EC2D0DB for ; Tue, 28 Jan 2020 14:14:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 22D112468E for ; Tue, 28 Jan 2020 14:14:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580220892; bh=HS5aaRqHS85+lsmZPbsV4tTRQcEw2dLfnXhENDDMITY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=khQC1mT8skg6aoAkAT+0Y4BFP6TSNer5TGPj84aBT6MSb87U/QMAM15jal8ORmOYz vY7Vz1k/jgPE+hZ1YK0BIJvp84GXQEWsZGdx9CQ7lItFCbjnWpUgCZOgM4rDEV/t0J HIcuKuBq2CAV2a7e63sBdpUIT+aV0eRed2eWfntk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729968AbgA1OOv (ORCPT ); Tue, 28 Jan 2020 09:14:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:37114 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729521AbgA1OOs (ORCPT ); Tue, 28 Jan 2020 09:14:48 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0B72324694; Tue, 28 Jan 2020 14:14:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580220888; bh=HS5aaRqHS85+lsmZPbsV4tTRQcEw2dLfnXhENDDMITY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HFA4CO6+hfO5CWssxazYK5ZjV/vJPQwMqgryLYS5ZIJlm6Pb/LWzW+qPRgruMuw5q RF2MgK42KMuYqKPCJMJbLD+pJLKxc3h+MbtEpR22t1vjdqMVB5S3vtyEPxSz9EgRX7 oSuTJbQSLSBZiZ30j8IxvenawtAuh6OKLzPkYuHE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chuhong Yuan , Vinod Koul , Sasha Levin Subject: [PATCH 4.4 156/183] dmaengine: ti: edma: fix missed failure handling Date: Tue, 28 Jan 2020 15:06:15 +0100 Message-Id: <20200128135845.329249763@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200128135829.486060649@linuxfoundation.org> References: <20200128135829.486060649@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 e508c8c5f3fde..17521fcf226f2 100644 --- a/drivers/dma/edma.c +++ b/drivers/dma/edma.c @@ -2288,8 +2288,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