From patchwork Thu Oct 13 17:52:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 2178 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp407873wrs; Thu, 13 Oct 2022 11:02:39 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4mAzJ7drTT/AhQjsn8EdMAGRrPjZzE0X/Mp5R5r0RAUBahL2mX7V4s3TTiF9VNQQQr61gY X-Received: by 2002:a17:902:d717:b0:17f:6155:e578 with SMTP id w23-20020a170902d71700b0017f6155e578mr849416ply.31.1665684159304; Thu, 13 Oct 2022 11:02:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665684159; cv=none; d=google.com; s=arc-20160816; b=x7eM09pytFdB12/vAWz822a8aelJnIgsvyhhm5CgE/Z2LAaxnYkFwf6VdfU8ldU/Nx IpgxWQrZPIJm9RI8qYEaCTCu7wdI/SgGNWPVrrgjzRKFFRyjQKmYo6Ati8g43ZFtDKJG vl1k9B3bhCc6zqAY8OK5FqOLXmlGaMqdyHDjMWB2WDyHXbU7bbAJWOOc6I1CuFcuLh1g CrxUh7VkI7o6elg5XposG4gyQDpv0mstXc/S2zPZbFutMCzn7rsnQZR0FUcMBms/3nOy +bf+6lnD7sOwQKW1JVfylkLacC0jOWwZiDPo/ubSEHdg2c+Z8fotxYmK2R2Doq1CKfag uyYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Dm3Z6iAOtznMsCTzapw1+suxcb5LtnDcBPMWzl3qf2M=; b=V/aGj5ZrkxdheDyqJrPHPw5NAzCYwzFtOmxcwQKnHX6t0e8fsysy7G55LmqxKQ922a 1ep5Rxy2xsyhZljl+9WWm5JiC5ZtneSvAbMvAri2EqbIk+a2K97/3MBiqFGlgwssBvws a9aYCH0g27+xNbt4UyDOmc/KG814adMEY/YgzqfU8YXHxiwcPnaLBsBWBR7ZgTwFDDQj JStpCTt+jlrE93KMUC005oJW1p44LsuuVRru/O1/47Y5zsoh+TBYmwnfUEkHnZzE3QGt zNsQ42nCg//3Ay0phxuZs+ae+IZmPLYUyRxN/kxui1taR8gCZnUdppAZrqKXO9ERVZSO 6GAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yiyUoB16; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gn2-20020a17090ac78200b00205cc2ec8a6si5389026pjb.136.2022.10.13.11.02.13; Thu, 13 Oct 2022 11:02:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yiyUoB16; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230327AbiJMSBh (ORCPT + 99 others); Thu, 13 Oct 2022 14:01:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57978 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230300AbiJMSB0 (ORCPT ); Thu, 13 Oct 2022 14:01:26 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D788550B89; Thu, 13 Oct 2022 11:01:00 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 388B061900; Thu, 13 Oct 2022 17:56:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 44D9BC433D6; Thu, 13 Oct 2022 17:56:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1665683766; bh=2s3E6s8by+Vv9fTcW1YuFronNVxsWvYo20qEG3TetXk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yiyUoB16k87oYnRL3JhoJtpQJ4DDpAHkVXnQhEOgELi0FtUzhsre4RG6Naf8lGXtF +pI0MYSM36IQWEHj3KolLv9doboa9QY54CXmYHcl/yzjVI5GyFtaZe9PWvjgDPw7wE A7NsDmxvSb+OupfW9UxYB1PMS1288zYwJp4sKW+c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Swati Agarwal , Vinod Koul , Sasha Levin Subject: [PATCH 5.10 16/54] dmaengine: xilinx_dma: Fix devm_platform_ioremap_resource error handling Date: Thu, 13 Oct 2022 19:52:10 +0200 Message-Id: <20221013175147.760049909@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221013175147.337501757@linuxfoundation.org> References: <20221013175147.337501757@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746596432871297135?= X-GMAIL-MSGID: =?utf-8?q?1746596432871297135?= From: Swati Agarwal [ Upstream commit 91df7751eb890e970afc08f50b8f0fa5ea39e03d ] Add missing cleanup in devm_platform_ioremap_resource(). When probe fails remove dma channel resources and disable clocks in accordance with the order of resources allocated . Signed-off-by: Swati Agarwal Link: https://lore.kernel.org/r/20220817061125.4720-2-swati.agarwal@xilinx.com Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/xilinx/xilinx_dma.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/dma/xilinx/xilinx_dma.c b/drivers/dma/xilinx/xilinx_dma.c index cab4719e4cf9..36801126312e 100644 --- a/drivers/dma/xilinx/xilinx_dma.c +++ b/drivers/dma/xilinx/xilinx_dma.c @@ -3020,9 +3020,10 @@ static int xilinx_dma_probe(struct platform_device *pdev) /* Request and map I/O memory */ xdev->regs = devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(xdev->regs)) - return PTR_ERR(xdev->regs); - + if (IS_ERR(xdev->regs)) { + err = PTR_ERR(xdev->regs); + goto disable_clks; + } /* Retrieve the DMA engine properties from the device tree */ xdev->max_buffer_len = GENMASK(XILINX_DMA_MAX_TRANS_LEN_MAX - 1, 0); xdev->s2mm_chan_id = xdev->dma_config->max_channels / 2; @@ -3115,7 +3116,7 @@ static int xilinx_dma_probe(struct platform_device *pdev) for_each_child_of_node(node, child) { err = xilinx_dma_child_probe(xdev, child); if (err < 0) - goto disable_clks; + goto error; } if (xdev->dma_config->dmatype == XDMA_TYPE_VDMA) { @@ -3150,12 +3151,12 @@ static int xilinx_dma_probe(struct platform_device *pdev) return 0; -disable_clks: - xdma_disable_allclks(xdev); error: for (i = 0; i < xdev->dma_config->max_channels; i++) if (xdev->chan[i]) xilinx_dma_chan_remove(xdev->chan[i]); +disable_clks: + xdma_disable_allclks(xdev); return err; }