Commit 79321a79 authored by Douglas Anderson's avatar Douglas Anderson Committed by David S. Miller
Browse files

r8152: Add RTL8152_INACCESSIBLE to r8153_aldps_en() 



Delay loops in r8152 should break out if RTL8152_INACCESSIBLE is set
so that they don't delay too long if the device becomes
inaccessible. Add the break to the loop in r8153_aldps_en().

Fixes: 4214cc55 ("r8152: check if disabling ALDPS is finished")
Reviewed-by: default avatarGrant Grundler <grundler@chromium.org>
Signed-off-by: default avatarDouglas Anderson <dianders@chromium.org>
Acked-by: default avatarHayes Wang <hayeswang@realtek.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8c53a7bd

drivers/net/usb/r8152.c

+2 −0
Original line number Diff line number Diff line
@@ -5803,6 +5803,8 @@ static void r8153_aldps_en(struct r8152 *tp, bool enable) 
		data &= ~EN_ALDPS;

		ocp_reg_write(tp, OCP_POWER_CFG, data);

		for (i = 0; i < 20; i++) {

			if (test_bit(RTL8152_INACCESSIBLE, &tp->flags))

				return;

			usleep_range(1000, 2000);

			if (ocp_read_word(tp, MCU_TYPE_PLA, 0xe000) & 0x0100)

				break;