From: roel kluin Date: Wed, 30 Dec 2009 06:43:06 +0000 (+0000) Subject: broadcom: Fix &&/|| confusion in bcm54xx_adjust_rxrefclk() X-Git-Tag: v3.0~6002^2~139 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7ec4e7d3cfee9d7846dbd02ad442c40cb58512e8;p=platform%2Fkernel%2Flinux-amlogic.git broadcom: Fix &&/|| confusion in bcm54xx_adjust_rxrefclk() This always evaluates to true. Signed-off-by: Roel Kluin Signed-off-by: David S. Miller --- diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c index c13cf64..33c4b12 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;