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 61D70C433E1 for ; Thu, 14 May 2020 18:57:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 325BA20801 for ; Thu, 14 May 2020 18:57:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589482666; bh=R2+G2g70Z5guBITJdADg/p7YFldTOiznc75Jb28esL0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Kz9Xy1ihqQpZw6gWiL3hX01wWS6dJJ/SfPwNbpM/MoMCqPjjvvv/TfJT+lt7D1GbX sElRmYpRIKIXjFeEgBMDiXiaIprLMPrUrolXV2IkB+ybCeRkE9dkhcUaWyaYeQqsW3 zaqXnLkiU1l6qg+D246x7/dO54deEb1k3KSND8sI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729844AbgENS5n (ORCPT ); Thu, 14 May 2020 14:57:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:57636 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728841AbgENS4g (ORCPT ); Thu, 14 May 2020 14:56:36 -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 539BA207D5; Thu, 14 May 2020 18:56:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589482596; bh=R2+G2g70Z5guBITJdADg/p7YFldTOiznc75Jb28esL0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WEDz8HHm7mhEm3pJxc+cR3koGUqC/uvfnjS9+NflwfvVjFCkrKoHxeuI7KIceB11Q 5b6cE6YNiZWbjyvML2BXQSccePm+pn+C/XfwrpYmfw45gr91Nu8uSi+CsLgvh+ePIG gpnigpU7+2ZJ1i3v0jU5dvWisSiVzA1VEDdL2TJo= 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 4.4 08/14] net: moxa: Fix a potential double 'free_irq()' Date: Thu, 14 May 2020 14:56:19 -0400 Message-Id: <20200514185625.21753-8-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200514185625.21753-1-sashal@kernel.org> References: <20200514185625.21753-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@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 f1dde59c9fa6c..374e691b11da6 100644 --- a/drivers/net/ethernet/moxa/moxart_ether.c +++ b/drivers/net/ethernet/moxa/moxart_ether.c @@ -541,7 +541,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