diff options
| author | roel kluin <roel.kluin@gmail.com> | 2009-12-30 01:43:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-04 01:01:32 -0500 |
| commit | 7ec4e7d3cfee9d7846dbd02ad442c40cb58512e8 (patch) | |
| tree | 39dc8d5ecad037ab3e1b88382deedd46837c1304 /drivers/net | |
| parent | 890c8c18986eb975a76aa8359a712596bc70e61c (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')
| -rw-r--r-- | drivers/net/phy/broadcom.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c index c13cf64095b6..33c4b12a63ba 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) | |||
| 331 | bool clk125en = true; | 331 | bool clk125en = true; |
| 332 | 332 | ||
| 333 | /* Abort if we are using an untested phy. */ | 333 | /* Abort if we are using an untested phy. */ |
| 334 | if (BRCM_PHY_MODEL(phydev) != PHY_ID_BCM57780 || | 334 | if (BRCM_PHY_MODEL(phydev) != PHY_ID_BCM57780 && |
| 335 | BRCM_PHY_MODEL(phydev) != PHY_ID_BCM50610 || | 335 | BRCM_PHY_MODEL(phydev) != PHY_ID_BCM50610 && |
| 336 | BRCM_PHY_MODEL(phydev) != PHY_ID_BCM50610M) | 336 | BRCM_PHY_MODEL(phydev) != PHY_ID_BCM50610M) |
| 337 | return; | 337 | return; |
| 338 | 338 | ||