iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

r8152: modify the check of the flag of PHY_RESET in set_speed function

Browse Source 
In set_speed(), BMCR_RESET would be set when the flag of PHY_RESET
is set. Use BMCR_RESET to replace testing the flag of PHY_RESET.

Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
hayeswang 2016-06-16 14:08:29 +08:00 committed by David S. Miller
parent d21cfb375e
commit fae5617877
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/usb/r8152.c
View File

@ -2872,7 +2872,7 @@ static int rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u16 speed, u8 duplex)
bmcr = BMCR_ANENABLE | BMCR_ANRESTART; bmcr = BMCR_ANENABLE | BMCR_ANRESTART;
} }
if (test_bit(PHY_RESET, &tp->flags)) if (test_and_clear_bit(PHY_RESET, &tp->flags))
bmcr |= BMCR_RESET; bmcr |= BMCR_RESET;
if (tp->mii.supports_gmii) if (tp->mii.supports_gmii)
@ -2881,7 +2881,7 @@ static int rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u16 speed, u8 duplex)
r8152_mdio_write(tp, MII_ADVERTISE, anar); r8152_mdio_write(tp, MII_ADVERTISE, anar);
r8152_mdio_write(tp, MII_BMCR, bmcr); r8152_mdio_write(tp, MII_BMCR, bmcr);
if (test_and_clear_bit(PHY_RESET, &tp->flags)) { if (bmcr & BMCR_RESET) {
int i; int i;
for (i = 0; i < 50; i++) { for (i = 0; i < 50; i++) {