summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/cirrus
diff options
context:
space:
mode:
authorChuhong Yuan <hslester96@gmail.com>2019-11-14 18:43:24 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-12-17 22:37:31 +0300
commitfaf35651c75253903de694128520e248a4bd486b (patch)
tree9d7ae8336ebad11c050f0dc38c4127fd3d8f732d /drivers/net/ethernet/cirrus
parentc4c09c87464eaf59bdb648d074414deb09d84936 (diff)
downloadlinux-faf35651c75253903de694128520e248a4bd486b.tar.xz
net: ep93xx_eth: fix mismatch of request_mem_region in remove
[ 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 <hslester96@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/cirrus')
-rw-r--r--drivers/net/ethernet/cirrus/ep93xx_eth.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/cirrus/ep93xx_eth.c b/drivers/net/ethernet/cirrus/ep93xx_eth.c
index e2a702996db4..82bd918bf967 100644
--- a/drivers/net/ethernet/cirrus/ep93xx_eth.c
+++ b/drivers/net/ethernet/cirrus/ep93xx_eth.c
@@ -767,6 +767,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)
@@ -782,8 +783,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);