* [PATCH] broadcom: Fix &&/|| confusion in bcm54xx_adjust_rxrefclk()
@ 2009-12-30 16:43 Roel Kluin
2010-01-04 6:01 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Roel Kluin @ 2009-12-30 16:43 UTC (permalink / raw)
To: netdev, Andrew Morton, LKML, mcarlson, davem
This always evaluates to true.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
---
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 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;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] broadcom: Fix &&/|| confusion in bcm54xx_adjust_rxrefclk()
2009-12-30 16:43 [PATCH] broadcom: Fix &&/|| confusion in bcm54xx_adjust_rxrefclk() Roel Kluin
@ 2010-01-04 6:01 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-01-04 6:01 UTC (permalink / raw)
To: roel.kluin; +Cc: netdev, akpm, linux-kernel, mcarlson
From: Roel Kluin <roel.kluin@gmail.com>
Date: Wed, 30 Dec 2009 17:43:06 +0100
> This always evaluates to true.
>
> Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Applied, thanks Roel.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-01-04 6:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-12-30 16:43 [PATCH] broadcom: Fix &&/|| confusion in bcm54xx_adjust_rxrefclk() Roel Kluin
2010-01-04 6:01 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).