diff options
| author |   hayeswang <hayeswang@realtek.com> | 2016-06-16 14:08:29 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-06-16 17:08:33 -0700 |
| commit | fae5617877f2e1040106385d94529f30780525e1 (patch) | |
| tree | 2147a8926c585ff956ded1eead44b38d80b2fbd1 /drivers/net/usb | |
| parent | net: ethernet: ax88796: use phy_ethtool_{get|set}_link_ksettings (diff) | |
| download | linux-dev-fae5617877f2e1040106385d94529f30780525e1.tar.xz linux-dev-fae5617877f2e1040106385d94529f30780525e1.zip | |
r8152: modify the check of the flag of PHY_RESET in set_speed function
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>
Diffstat (limited to 'drivers/net/usb')
| -rw-r--r-- | drivers/net/usb/r8152.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 69d1bbfd1fa0..11178f9dc838 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -2872,7 +2872,7 @@ static int rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u16 speed, u8 duplex) bmcr = BMCR_ANENABLE | BMCR_ANRESTART; } - if (test_bit(PHY_RESET, &tp->flags)) + if (test_and_clear_bit(PHY_RESET, &tp->flags)) bmcr |= BMCR_RESET; 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_BMCR, bmcr); - if (test_and_clear_bit(PHY_RESET, &tp->flags)) { + if (bmcr & BMCR_RESET) { int i; for (i = 0; i < 50; i++) { |