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

commit 7ec4e7d upstream. This always evaluates to true. Signed-off-by: Roel Kluin <[email protected]> Signed-off-by: David S. Miller <[email protected]>
blinkosm · Sep 11, 2011 · 264498e · 264498e
1 parent f62b9b5
commit 264498e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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;