Skip to contentSkip to conversation

broadcom: Fix &&/|| confusion in bcm54xx_adjust_rxrefclk()

PATCH Applied Roel Kluin 2 participants 2 messages Dec 30, 2009 – Jan 4, 2010

Subsystems (4)
Networking Network drivers Ethernet PHY Broadcom Ethernet PHY drivers
lore
Share & tools
lore

Roel Kluin

author
#0 lore raw

PATCH 1/1 broadcom: Fix &&/|| confusion in bcm54xx_adjust_rxrefclk()

This always evaluates to true.

Signed-off-by Roel Kluin <[email protected]>
---
 drivers/net/phy/broadcom.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/phy/broadcom.c +2 -2
index c13cf64..33c4b12 100644
@@ -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;