aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiner Kallweit <hkallweit1@gmail.com>2018-11-12 21:16:06 +0100
committerDavid S. Miller <davem@davemloft.net>2018-11-16 19:31:06 -0800
commita21ff3c83b1a7e110bae208221ef817251ef564c (patch)
tree09b45383d6f756e9ad84cd3270767651551a266f
parentMerge branch 'Remove-VLAN-CFI-overload' (diff)
downloadlinux-dev-a21ff3c83b1a7e110bae208221ef817251ef564c.tar.xz
linux-dev-a21ff3c83b1a7e110bae208221ef817251ef564c.zip
net: phy: check for implementation of both callbacks in phy_drv_supports_irq
Now that the icplus driver has been fixed all PHY drivers supporting interrupts have both callbacks (config_intr and ack_interrupt) implemented - as it should be. Therefore phy_drv_supports_irq() can be changed now to check for both callbacks being implemented. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Acked-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/phy/phy_device.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 55202a0ac476..e06613f2d431 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -2122,7 +2122,7 @@ static void of_set_phy_eee_broken(struct phy_device *phydev)
static bool phy_drv_supports_irq(struct phy_driver *phydrv)
{
- return phydrv->config_intr || phydrv->ack_interrupt;
+ return phydrv->config_intr && phydrv->ack_interrupt;
}
/**