From: Wolfgang Grandegger Date: Thu, 17 Nov 2011 03:06:44 +0000 (+0000) Subject: ibm/emac: fix improper cleanup when device is removed to allow re-bind X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=d6f144830bdfa5fcf116e9ab8fc6a60d23fa623d;p=openwrt%2Fstaging%2Fblogic.git ibm/emac: fix improper cleanup when device is removed to allow re-bind The re-binding (unbind..bind) of an EMAC device fails because the static variable "busy_phy_map" is not updated when the device is removed. Signed-off-by: Wolfgang Grandegger Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/ibm/emac/core.c b/drivers/net/ethernet/ibm/emac/core.c index ed79b2d3ad3e..2abce965c7bd 100644 --- a/drivers/net/ethernet/ibm/emac/core.c +++ b/drivers/net/ethernet/ibm/emac/core.c @@ -2924,6 +2924,9 @@ static int __devexit emac_remove(struct platform_device *ofdev) if (emac_has_feature(dev, EMAC_FTR_HAS_ZMII)) zmii_detach(dev->zmii_dev, dev->zmii_port); + busy_phy_map &= ~(1 << dev->phy.address); + DBG(dev, "busy_phy_map now %#x" NL, busy_phy_map); + mal_unregister_commac(dev->mal, &dev->commac); emac_put_deps(dev);