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,URIBL_BLOCKED,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 B7F6AC433E0 for ; Thu, 14 May 2020 19:11:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 861AF20675 for ; Thu, 14 May 2020 19:11:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589483483; bh=OePKM7A1K0XYiRWplDYUiamyPrsd/Yopn1WWNiCHw9c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=o5zqBgfb3LBN7RIhC1P8LyeNodHQvgMwIQ91xOBdbtWFTvWUrRyKNPDOxaKwaF+Xi Fk10178/I0AN3RjitWc/DxdHGuvXTifDCA7Pc/qgh/MqY543nX4KX5OG/v258DuUjC 8Nw9znShg6omOTM8G60gWCSrjYuy7eebaKFbLLlM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730200AbgENTLM (ORCPT ); Thu, 14 May 2020 15:11:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:50456 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728277AbgENSwU (ORCPT ); Thu, 14 May 2020 14:52:20 -0400 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 450A820675; Thu, 14 May 2020 18:52:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589482339; bh=OePKM7A1K0XYiRWplDYUiamyPrsd/Yopn1WWNiCHw9c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OSwTrSoH8xm9vqUG8zHoUosGkMrIpFzSJCegn7Q20PbRdBALuTvW5ihszcY5c4tAE X64LQB9+wpp9VLg1je03SiZ46AY0C4ImCpYinuEaww904XwSH+0UCpVrf08Owzbf/O yU+LX5rpUnPmhmPifCuj9rUAjXm5z8jsoCXX0s28= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Christophe JAILLET , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.6 24/62] net: moxa: Fix a potential double 'free_irq()' Date: Thu, 14 May 2020 14:51:09 -0400 Message-Id: <20200514185147.19716-24-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200514185147.19716-1-sashal@kernel.org> References: <20200514185147.19716-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Christophe JAILLET [ Upstream commit ee8d2267f0e39a1bfd95532da3a6405004114b27 ] Should an irq requested with 'devm_request_irq' be released explicitly, it should be done by 'devm_free_irq()', not 'free_irq()'. Fixes: 6c821bd9edc9 ("net: Add MOXA ART SoCs ethernet driver") Signed-off-by: Christophe JAILLET Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/moxa/moxart_ether.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/moxa/moxart_ether.c b/drivers/net/ethernet/moxa/moxart_ether.c index e1651756bf9da..f70bb81e1ed65 100644 --- a/drivers/net/ethernet/moxa/moxart_ether.c +++ b/drivers/net/ethernet/moxa/moxart_ether.c @@ -564,7 +564,7 @@ static int moxart_remove(struct platform_device *pdev) struct net_device *ndev = platform_get_drvdata(pdev); unregister_netdev(ndev); - free_irq(ndev->irq, ndev); + devm_free_irq(&pdev->dev, ndev->irq, ndev); moxart_mac_free_memory(ndev); free_netdev(ndev); -- 2.20.1