diff mbox series

net: ep93xx_eth: fix mismatch of request_mem_region in remove

Message ID 20191114154324.31990-1-hslester96@gmail.com
State Accepted
Delegated to: David Miller
Headers show
Series net: ep93xx_eth: fix mismatch of request_mem_region in remove | expand

Commit Message

Chuhong Yuan Nov. 14, 2019, 3:43 p.m. UTC
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>
---
 drivers/net/ethernet/cirrus/ep93xx_eth.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

David Miller Nov. 15, 2019, 8:42 p.m. UTC | #1
From: Chuhong Yuan <hslester96@gmail.com>
Date: Thu, 14 Nov 2019 23:43:24 +0800

> 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>

Applied, thanks.

It's a shame that you can't just pass in the thing you got back from
request_mem_region() to free it.  And honestly the only thing that makes
calling release_region() wrong is that release_region() doesn't free up
the region object after unlinking it from the tree.
diff mbox series

Patch

diff --git a/drivers/net/ethernet/cirrus/ep93xx_eth.c b/drivers/net/ethernet/cirrus/ep93xx_eth.c
index f1a0c4dceda0..f37c9a08c4cf 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);