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 10AD6C432C0 for ; Fri, 22 Nov 2019 19:50:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D588720731 for ; Fri, 22 Nov 2019 19:50:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574452233; bh=otUWK49KyyBOMV/bSn9NkqTZ1N4WCHx+CSRaC3fXr8A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=n5fGthLVLBNN6VaCAzX90K1AWoryr9fsNeMNNErzR/XzzHVr6AxPv9XOcNJc4ALyD K285MIWYuuQPFfbF+SaqWHoLwao8IRyyh//s2Y15KJvV9b/QydxjXFpqAd5iGEXJ2V BOZX57jHIu6nS1LAFFDZjs3SAFkCi8yknxAnJVCo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727883AbfKVTua (ORCPT ); Fri, 22 Nov 2019 14:50:30 -0500 Received: from mail.kernel.org ([198.145.29.99]:51366 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727862AbfKVTuZ (ORCPT ); Fri, 22 Nov 2019 14:50:25 -0500 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 95FF620731; Fri, 22 Nov 2019 19:50:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574452225; bh=otUWK49KyyBOMV/bSn9NkqTZ1N4WCHx+CSRaC3fXr8A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jFbr9mshZRKeiBvxtfB9LXo28LKjMHwNBI/6ttIMJp7xQ7PMm18sDH8riOBsm775+ gq6FJi1/fY2xZMdnmZEEq7BY8eYq6jtL89jKdYCCkwffhrapoQJPYTPrVEauVn59fh QUonhwZx+SEuvUcVykoZGbzgWXbufz6aj6iv7ILE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chuhong Yuan , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 9/9] net: ep93xx_eth: fix mismatch of request_mem_region in remove Date: Fri, 22 Nov 2019 14:50:14 -0500 Message-Id: <20191122195014.25065-9-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191122195014.25065-1-sashal@kernel.org> References: <20191122195014.25065-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: 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 de9f7c97d916d..796ee362ad70c 100644 --- a/drivers/net/ethernet/cirrus/ep93xx_eth.c +++ b/drivers/net/ethernet/cirrus/ep93xx_eth.c @@ -776,6 +776,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) @@ -791,8 +792,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