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,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 5A422C2D0D1 for ; Thu, 19 Dec 2019 19:08:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 25BBA24672 for ; Thu, 19 Dec 2019 19:08:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576782490; bh=bA+AWX+r9jIYVn9fb0mavTdRwonn+lP6pVz/FSvOLoM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1FEG81QXL+aXOpyu93aihi0QNupmIHW5PzGDgROmT6u4LePmj29jIb3COjsD/WN2Z IOZxLztdhPtIr0xhyJ43cILTwbUE9FojgmsveYZ687a3UEYg9HFuEzr2qB0y8trQqR Jz4DZadPuQa1vSN7O2pKGI2QFX9KNOa4tsGY7w8k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728653AbfLSSmS (ORCPT ); Thu, 19 Dec 2019 13:42:18 -0500 Received: from mail.kernel.org ([198.145.29.99]:33384 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728663AbfLSSmR (ORCPT ); Thu, 19 Dec 2019 13:42:17 -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 DC564206D7; Thu, 19 Dec 2019 18:42:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576780936; bh=bA+AWX+r9jIYVn9fb0mavTdRwonn+lP6pVz/FSvOLoM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TTlPlZnKCh1kJzglryIOeGO/GV/jqxYDm6QP0MFJvrQSdQIUXpdyergEf/mTMMnLD gJY/Ri4FsJbbYqDGc1IY+bZMBXM7dk6uKRQn0BiKrn7fCdiQhQayktcU7RqgxzobAq swQqy8r9Y5BQRXFe5tiqgrT70P1jcCY9f/LQvdvU= 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 4.9 016/199] net: ep93xx_eth: fix mismatch of request_mem_region in remove Date: Thu, 19 Dec 2019 19:31:38 +0100 Message-Id: <20191219183215.670147273@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191219183214.629503389@linuxfoundation.org> References: <20191219183214.629503389@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 9a161e9815297..24f69034f52c4 100644 --- a/drivers/net/ethernet/cirrus/ep93xx_eth.c +++ b/drivers/net/ethernet/cirrus/ep93xx_eth.c @@ -780,6 +780,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) @@ -795,8 +796,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