From 4e0f93bb76e6bf67812b0c8dc14608cba1661f0f Mon Sep 17 00:00:00 2001 From: Wolfgang Grandegger Date: Thu, 17 Nov 2011 03:06:44 +0000 Subject: [PATCH] --- yaml --- r: 277893 b: refs/heads/master c: d6f144830bdfa5fcf116e9ab8fc6a60d23fa623d h: refs/heads/master i: 277891: 6d9853a306aa4069004a25ca1c0e65bf1b8ebc68 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/ibm/emac/core.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 673d0290b089..511aca632fb8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e11c259f745889b55bc5596ca78271f2f5cf08d2 +refs/heads/master: d6f144830bdfa5fcf116e9ab8fc6a60d23fa623d diff --git a/trunk/drivers/net/ethernet/ibm/emac/core.c b/trunk/drivers/net/ethernet/ibm/emac/core.c index ed79b2d3ad3e..2abce965c7bd 100644 --- a/trunk/drivers/net/ethernet/ibm/emac/core.c +++ b/trunk/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);