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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5992AC43219 for ; Wed, 16 Mar 2022 14:16:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356516AbiCPOR7 (ORCPT ); Wed, 16 Mar 2022 10:17:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356498AbiCPORi (ORCPT ); Wed, 16 Mar 2022 10:17:38 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0871268FA1; Wed, 16 Mar 2022 07:16:24 -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 ams.source.kernel.org (Postfix) with ESMTPS id A7D16B81B7A; Wed, 16 Mar 2022 14:16:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DE833C36AE5; Wed, 16 Mar 2022 14:16:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647440181; bh=icmzaQjTA2AMAeSYFVcRD2WKyO+/3zIAb8Ggsg0MqkQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=awteJB27jGwsLVxwsvzS2aqXl6BjhazDV2lcQDGVv3Q1k1UuFfe3NLGc4GLY+aAjh Zl5x8klbVhZyRduemZo04KkFB6JNPxoQtzaEUGzayvWwUBmUqejbcGcFPO655atnfA qn3mTdKm5b3qz+Q1xkGPNvULjUutIQ+Sh4YKePnH5wJhEqglT9g51x4WiN0Aivshgu Eh0//vebcPSXUCBCr4eLz++CWICv/hkl5G7MaKy57qO8jqwq2yG4wSxdUwHMF9cCIX XzLG6e3hrwa1RUVcDR9csbWFd7Bnmftkak54qT3Ot0DbygvCXRuBqflkZdHVLSssEs cAW+mon+aKH3Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zheyu Ma , Andrew Lunn , "David S . Miller" , Sasha Levin , kuba@kernel.org, christophe.jaillet@wanadoo.fr, tanghui20@huawei.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 10/13] ethernet: sun: Free the coherent when failing in probing Date: Wed, 16 Mar 2022 10:15:10 -0400 Message-Id: <20220316141513.247965-10-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220316141513.247965-1-sashal@kernel.org> References: <20220316141513.247965-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Zheyu Ma [ Upstream commit bb77bd31c281f70ec77c9c4f584950a779e05cf8 ] When the driver fails to register net device, it should free the DMA region first, and then do other cleanup. Signed-off-by: Zheyu Ma Reviewed-by: Andrew Lunn Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/sun/sunhme.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c index 62f81b0d14ed..b05ee2e0e305 100644 --- a/drivers/net/ethernet/sun/sunhme.c +++ b/drivers/net/ethernet/sun/sunhme.c @@ -3139,7 +3139,7 @@ static int happy_meal_pci_probe(struct pci_dev *pdev, if (err) { printk(KERN_ERR "happymeal(PCI): Cannot register net device, " "aborting.\n"); - goto err_out_iounmap; + goto err_out_free_coherent; } pci_set_drvdata(pdev, hp); @@ -3172,6 +3172,10 @@ static int happy_meal_pci_probe(struct pci_dev *pdev, return 0; +err_out_free_coherent: + dma_free_coherent(hp->dma_dev, PAGE_SIZE, + hp->happy_block, hp->hblock_dvma); + err_out_iounmap: iounmap(hp->gregs); -- 2.34.1