diff options
| author | Roel Kluin <12o3l@tiscali.nl> | 2008-01-29 21:14:56 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-03 04:28:36 -0800 |
| commit | 10a5a80b3c69d65d66c4d9f4f796725f09bbc8cb (patch) | |
| tree | 0b7c804e641f94ae2946bbb8e900ab80ee0a1fd0 /drivers/net/arm | |
| parent | 7b9b09436b8720621e5594ce25fd25f34d5d42be (diff) | |
| download | blackbird-op-linux-10a5a80b3c69d65d66c4d9f4f796725f09bbc8cb.tar.gz blackbird-op-linux-10a5a80b3c69d65d66c4d9f4f796725f09bbc8cb.zip | |
drivers/net/arm/at91_ether.c: logical/bitand typo in function reset_phy()
include/linux/mii.h:48:#define BMCR_RESET 0x8000
The function reset_phy() is in "#if 0" inactivated code
Replace logical "&&" by bit "&" before BMCR_RESET
Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/arm')
| -rw-r--r-- | drivers/net/arm/at91_ether.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/arm/at91_ether.c b/drivers/net/arm/at91_ether.c index 25b114a4e2b1..0ae0d83e5d22 100644 --- a/drivers/net/arm/at91_ether.c +++ b/drivers/net/arm/at91_ether.c @@ -384,7 +384,7 @@ static void reset_phy(struct net_device *dev) /* Wait until PHY reset is complete */ do { read_phy(lp->phy_address, MII_BMCR, &bmcr); - } while (!(bmcr && BMCR_RESET)); + } while (!(bmcr & BMCR_RESET)); disable_mdi(); spin_unlock_irq(&lp->lock); |
