提交 10a5a80b 编写于 作者: R Roel Kluin 提交者: David S. Miller

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: NRoel Kluin <12o3l@tiscali.nl>
Signed-off-by: NJeff Garzik <jeff@garzik.org>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 7b9b0943
...@@ -384,7 +384,7 @@ static void reset_phy(struct net_device *dev) ...@@ -384,7 +384,7 @@ static void reset_phy(struct net_device *dev)
/* Wait until PHY reset is complete */ /* Wait until PHY reset is complete */
do { do {
read_phy(lp->phy_address, MII_BMCR, &bmcr); read_phy(lp->phy_address, MII_BMCR, &bmcr);
} while (!(bmcr && BMCR_RESET)); } while (!(bmcr & BMCR_RESET));
disable_mdi(); disable_mdi();
spin_unlock_irq(&lp->lock); spin_unlock_irq(&lp->lock);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册