From: Jean-Michel Hautbois <jhautbois@gmail.com>
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 <jhautbois@gmail.com>
Subject: [PATCH 1/2] net: phy: balance disable/enable irq on change
Date: Sat, 18 Dec 2010 19:41:43 +0100 [thread overview]
Message-ID: <1292697704-2886-1-git-send-email-jhautbois@gmail.com> (raw)
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 <jhautbois@gmail.com>
---
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 */
--
1.7.0.4
next reply other threads:[~2010-12-18 18:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-18 18:41 Jean-Michel Hautbois [this message]
2010-12-18 18:41 ` [PATCH 2/2] net: phy: Fixed some checkpatch errors Jean-Michel Hautbois
2010-12-19 9:19 ` Joe Perches
-- strict thread matches above, loose matches on Subject: below --
2010-12-18 18:38 [PATCH 1/2] net: phy: balance disable/enable irq on change Jean-Michel Hautbois
2010-12-18 15:55 Jean-Michel Hautbois
2010-12-18 16:47 ` Ben Hutchings
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1292697704-2886-1-git-send-email-jhautbois@gmail.com \
--to=jhautbois@gmail.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=randy.dunlap@oracle.com \
--cc=richard.cochran@omicron.at \
--cc=shemminger@vyatta.com \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).