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,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 40AB9C43603 for ; Wed, 11 Dec 2019 16:05:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 138D220836 for ; Wed, 11 Dec 2019 16:05:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576080323; bh=9PI1QPNR2iHRgZayRSUSeas2bsFCkeZ0CrEQq7RCfcw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KS7bJYy8pQWxCWe9XYkrfAb+YKLZeWOadcMjl5ucffHScahulpVu/xmDxoSoykc41 SzCIfpfXNDbWkcu7Z+InL2tgS+R51cUQDZHTVrlryF7C3cU/RasD1dfXJw202Orfxs Xr81ZiHAoo+HaW6jvWn5eSKObMHtQKCKBOj7dru8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388773AbfLKQFS (ORCPT ); Wed, 11 Dec 2019 11:05:18 -0500 Received: from mail.kernel.org ([198.145.29.99]:35250 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731244AbfLKPMw (ORCPT ); Wed, 11 Dec 2019 10:12:52 -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 E444F24654; Wed, 11 Dec 2019 15:12:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576077171; bh=9PI1QPNR2iHRgZayRSUSeas2bsFCkeZ0CrEQq7RCfcw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yiQZP+6wImaN9kCHENsBEoTRscIb9PxiJZI09kqU707mN9/HBqmqKCCXbQ17vp8yc kl+5RuqjR4vE+a0IUKvX1pP+d1oWo/Vm8LAFrh9/o9TJRwG/BL6jPmwJkx7iiyN3+D TGJUGenFvykaXS/O4Nx53pGgwBRouC3mKrlitGg4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chuhong Yuan , "David S. Miller" , Sasha Levin Subject: [PATCH 5.3 042/105] net: ep93xx_eth: fix mismatch of request_mem_region in remove Date: Wed, 11 Dec 2019 16:05:31 +0100 Message-Id: <20191211150237.980765149@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191211150221.153659747@linuxfoundation.org> References: <20191211150221.153659747@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Chuhong Yuan [ Upstream commit 3df70afe8d33f4977d0e0891bdcfb639320b5257 ] The driver calls release_resource in remove to match request_mem_region in probe, which is incorrect. Fix it by using the right one, release_mem_region. Signed-off-by: Chuhong Yuan Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/cirrus/ep93xx_eth.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/cirrus/ep93xx_eth.c b/drivers/net/ethernet/cirrus/ep93xx_eth.c index f1a0c4dceda0c..f37c9a08c4cf5 100644 --- a/drivers/net/ethernet/cirrus/ep93xx_eth.c +++ b/drivers/net/ethernet/cirrus/ep93xx_eth.c @@ -763,6 +763,7 @@ static int ep93xx_eth_remove(struct platform_device *pdev) { struct net_device *dev; struct ep93xx_priv *ep; + struct resource *mem; dev = platform_get_drvdata(pdev); if (dev == NULL) @@ -778,8 +779,8 @@ static int ep93xx_eth_remove(struct platform_device *pdev) iounmap(ep->base_addr); if (ep->res != NULL) { - release_resource(ep->res); - kfree(ep->res); + mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); + release_mem_region(mem->start, resource_size(mem)); } free_netdev(dev); -- 2.20.1