From patchwork Sat Dec 18 18:41:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Michel Hautbois X-Patchwork-Id: 76092 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 50CC1B70AA for ; Sun, 19 Dec 2010 05:42:23 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932139Ab0LRSlz (ORCPT ); Sat, 18 Dec 2010 13:41:55 -0500 Received: from mail-ww0-f44.google.com ([74.125.82.44]:52807 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932116Ab0LRSly (ORCPT ); Sat, 18 Dec 2010 13:41:54 -0500 Received: by wwa36 with SMTP id 36so1729895wwa.1 for ; Sat, 18 Dec 2010 10:41:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=Md8d0UEWpeCFORZA2ihgicob32US+IJvqwdd2Evfrr0=; b=GIScJfrTNxenb9YUKGx040lCFcXz5RDNvLTHReQnStIuBWXTvb8FoWUHaspQgkWCAE rJc6OUIzg3BXzU7F7xLrN0/EKdaHuH8vA1C4im37TW4mONsuvjV83NgdrnY7Vu7GxJsG ktbk+OMWp75915kpQri8qCuRfksIHjvhXPUaE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=DAfTbCvgINouXjBMW8qQTsdeDEm41bVEAGfNNelePmimI4ip89BjbMyldepPgOWpFK zemjKuaTClrhDEu3igv6wSo9bla+92kHOBl7uPKCTumOoCjJec1MxOOCEeS9ClTo+EpK Q4ZWwWbf42WpaFvDqydCrevp4P3BvbktjCBpQ= Received: by 10.216.55.145 with SMTP id k17mr5769682wec.48.1292697712542; Sat, 18 Dec 2010 10:41:52 -0800 (PST) Received: from localhost.localdomain (pat35-2-82-240-214-173.fbx.proxad.net [82.240.214.173]) by mx.google.com with ESMTPS id o51sm906693wes.39.2010.12.18.10.41.50 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 18 Dec 2010 10:41:51 -0800 (PST) From: Jean-Michel Hautbois To: davem@davemloft.net Cc: richard.cochran@omicron.at, shemminger@vyatta.com, tj@kernel.org, randy.dunlap@oracle.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Jean-Michel Hautbois Subject: [PATCH 1/2] net: phy: balance disable/enable irq on change Date: Sat, 18 Dec 2010 19:41:43 +0100 Message-Id: <1292697704-2886-1-git-send-email-jhautbois@gmail.com> X-Mailer: git-send-email 1.7.0.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When phy interface changes its status, it calls phy_change() function. This function calls the interrupt disabling functions for the driver registered, but if this driver doesn't implement it, there is no IRQ disabling. After doing the work, we call enable_irq and not the respective driver function. This fixes it, as it could lead to an unbalanced IRQ. Error code changed to EOPNOTSUPP. Signed-off-by: Jean-Michel Hautbois --- drivers/net/phy/phy.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 7670aac..5f23e8e 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -89,7 +89,8 @@ static int phy_config_interrupt(struct phy_device *phydev, u32 interrupts) phydev->interrupts = interrupts; if (phydev->drv->config_intr) err = phydev->drv->config_intr(phydev); - + else + err = -EOPNOTSUPP; return err; } @@ -541,6 +542,10 @@ static int phy_enable_interrupts(struct phy_device *phydev) return err; err = phy_config_interrupt(phydev, PHY_INTERRUPT_ENABLED); + if (err == -EOPNOTSUPP) { + err = 0; + enable_irq(phydev->irq); + } return err; } @@ -556,7 +561,10 @@ static int phy_disable_interrupts(struct phy_device *phydev) /* Disable PHY interrupts */ err = phy_config_interrupt(phydev, PHY_INTERRUPT_DISABLED); - if (err) + if (err == -EOPNOTSUPP) { + err = 0; + disable_irq(phydev->irq); + } else if (err != 0) goto phy_err; /* Clear the interrupt */