projects
/
profile
/
common
/
kernel-common.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
890c8c1
)
broadcom: Fix &&/|| confusion in bcm54xx_adjust_rxrefclk()
author
roel kluin
<roel.kluin@gmail.com>
Wed, 30 Dec 2009 06:43:06 +0000
(06:43 +0000)
committer
David S. Miller
<davem@davemloft.net>
Mon, 4 Jan 2010 06:01:32 +0000
(22:01 -0800)
This always evaluates to true.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/phy/broadcom.c
patch
|
blob
|
history
diff --git
a/drivers/net/phy/broadcom.c
b/drivers/net/phy/broadcom.c
index
c13cf64
..
33c4b12
100644
(file)
--- 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;