From patchwork Sat Dec 18 18:38:59 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: 76089 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 B8BC3B6EE8 for ; Sun, 19 Dec 2010 05:39:58 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932133Ab0LRSjN (ORCPT ); Sat, 18 Dec 2010 13:39:13 -0500 Received: from mail-wy0-f174.google.com ([74.125.82.174]:50269 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932100Ab0LRSjM (ORCPT ); Sat, 18 Dec 2010 13:39:12 -0500 Received: by wyb28 with SMTP id 28so1698587wyb.19 for ; Sat, 18 Dec 2010 10:39:10 -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=WrMv/UH+aAP29DvoriAee4Vcz9NFvncRrCNAeM8f0rQ=; b=h+fqMgspBTH6vbxpiVGC4EFavD6v536h/3WnvUXnkQIL88p8p28FtY4EN4X1/mQBCR 9xunHcD8/Tn+jW3pBmWlcwH1mWYjWYzE2V5M5nM8jflvZJ8sl00qAPPHM4Izt/hMQ+zh rQWgO43GBzUEFL8PG4PsYbHmQ2yxhaF8UpWMY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=jUvJJ2cES75E0gdU3Fmn7ioIp5gYoTIuo7U+7xXVaqtMZNsuSKgkkSF8H+HGXNnHJJ lJU9m3zsRIXQTiz0eHRjem5FAF5gDNJu12vMa+ZzY447BawJA/nueGH4eN4jyEXh5qGD 0xHjNXnfWvjnK2LgQWAq9eIzo6U4HYaTAkhlc= Received: by 10.216.154.83 with SMTP id g61mr2904795wek.87.1292697550287; Sat, 18 Dec 2010 10:39:10 -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 e12sm905955wer.36.2010.12.18.10.39.08 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 18 Dec 2010 10:39:09 -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:38:59 +0100 Message-Id: <1292697540-2723-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. 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..b28f2ac 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 = -ENOSYS; 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 == -ENOSYS) { + 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 == -ENOSYS) { + err = 0; + disable_irq(phydev->irq); + } else if (err != 0) goto phy_err; /* Clear the interrupt */