Commit fae56178 authored by hayeswang's avatar hayeswang Committed by David S. Miller
Browse files

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: default avatarHayes Wang <hayeswang@realtek.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d21cfb37

drivers/net/usb/r8152.c

+2 −2
Original line number Diff line number Diff line
@@ -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++) {