summaryrefslogtreecommitdiff
path: root/drivers/net/phy
diff options
context:
space:
mode:
authorroel kluin <roel.kluin@gmail.com>2009-12-30 06:43:06 +0000
committerDavid S. Miller <davem@davemloft.net>2010-01-03 22:01:32 -0800
commit7ec4e7d3cfee9d7846dbd02ad442c40cb58512e8 (patch)
tree39dc8d5ecad037ab3e1b88382deedd46837c1304 /drivers/net/phy
parent890c8c18986eb975a76aa8359a712596bc70e61c (diff)
broadcom: Fix &&/|| confusion in bcm54xx_adjust_rxrefclk()
This always evaluates to true. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy')
-rw-r--r--drivers/net/phy/broadcom.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
index c13cf64095b..33c4b12a63b 100644
--- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
@@ -331,8 +331,8 @@ static void bcm54xx_adjust_rxrefclk(struct phy_device *phydev)
bool clk125en = true;
/* Abort if we are using an untested phy. */
- if (BRCM_PHY_MODEL(phydev) != PHY_ID_BCM57780 ||
- BRCM_PHY_MODEL(phydev) != PHY_ID_BCM50610 ||
+ if (BRCM_PHY_MODEL(phydev) != PHY_ID_BCM57780 &&
+ BRCM_PHY_MODEL(phydev) != PHY_ID_BCM50610 &&
BRCM_PHY_MODEL(phydev) != PHY_ID_BCM50610M)
return;