f5f173e2b7
* fixes NAND * adds latest ethernet patches Signed-off-by: John Crispin <john@phrozen.org>
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
From b1c85818c3fb00022dc125bb62d657d3fd3cf49c Mon Sep 17 00:00:00 2001
|
|
From: John Crispin <john@phrozen.org>
|
|
Date: Sat, 7 May 2016 06:31:08 +0200
|
|
Subject: [PATCH 077/102] net-next: mediatek: use mdiobus_free() in favour of
|
|
kfree()
|
|
|
|
The driver currently uses kfree() to clear the mii_bus. This is not the
|
|
correct way to clear the memory and mdiobus_free() should be used instead.
|
|
This patch fixes the two instances where this happens in the driver.
|
|
|
|
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|
Signed-off-by: John Crispin <john@phrozen.org>
|
|
---
|
|
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
index bab5d45..0c8d369 100644
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
@@ -280,7 +280,7 @@ static int mtk_mdio_init(struct mtk_eth *eth)
|
|
return 0;
|
|
|
|
err_free_bus:
|
|
- kfree(eth->mii_bus);
|
|
+ mdiobus_free(eth->mii_bus);
|
|
|
|
err_put_node:
|
|
of_node_put(mii_np);
|
|
@@ -295,7 +295,7 @@ static void mtk_mdio_cleanup(struct mtk_eth *eth)
|
|
|
|
mdiobus_unregister(eth->mii_bus);
|
|
of_node_put(eth->mii_bus->dev.of_node);
|
|
- kfree(eth->mii_bus);
|
|
+ mdiobus_free(eth->mii_bus);
|
|
}
|
|
|
|
static inline void mtk_irq_disable(struct mtk_eth *eth, u32 mask)
|
|
--
|
|
1.7.10.4
|
|
|