From patchwork Thu Nov 17 13:06:44 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfgang Grandegger X-Patchwork-Id: 126212 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 1E455B71F0 for ; Fri, 18 Nov 2011 00:06:51 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757414Ab1KQNGq (ORCPT ); Thu, 17 Nov 2011 08:06:46 -0500 Received: from ngcobalt02.manitu.net ([217.11.48.102]:49890 "EHLO ngcobalt02.manitu.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753520Ab1KQNGq (ORCPT ); Thu, 17 Nov 2011 08:06:46 -0500 Received: from [10.0.30.2] (pD9E178C8.dip.t-dialin.net [217.225.120.200]) (authenticated as wg with PLAIN) by ngcobalt02.manitu.net (8.10.2/8.10.2) with ESMTP id pAHD6kH04493; Thu, 17 Nov 2011 14:06:46 +0100 X-manitu-Original-Sender-IP: 217.225.120.200 X-manitu-Original-Receiver-Name: ngcobalt02.manitu.net Message-ID: <4EC506E4.5060806@grandegger.com> Date: Thu, 17 Nov 2011 14:06:44 +0100 From: Wolfgang Grandegger User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.23) Gecko/20110922 Thunderbird/3.1.15 MIME-Version: 1.0 To: Netdev@vger.kernel.org CC: Linuxppc-dev@lists.ozlabs.org Subject: [PATCH net-next] ibm/emac: fix improper cleanup when device is removed to allow re-bind X-Enigmail-Version: 1.1.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- drivers/net/ethernet/ibm/emac/core.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/drivers/net/ethernet/ibm/emac/core.c b/drivers/net/ethernet/ibm/emac/core.c index ed79b2d..2abce96 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);