diff options
| author | Douglas Anderson <dianders@chromium.org> | 2023-10-20 14:06:57 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-10-22 11:46:18 +0100 |
| commit | bc65cc42af737a5a35f83842408ef2c6c79ba025 (patch) | |
| tree | 97ec29135e3bdf6db59b27c547100b24a7d36e0f | |
| parent | dc90ba37a8c37042407fa6970b9830890cfe6047 (diff) | |
| download | lwn-bc65cc42af737a5a35f83842408ef2c6c79ba025.tar.gz lwn-bc65cc42af737a5a35f83842408ef2c6c79ba025.zip | |
r8152: Check for unplug in r8153b_ups_en() / r8153c_ups_en()
If the adapter is unplugged while we're looping in r8153b_ups_en() /
r8153c_ups_en() we could end up looping for 10 seconds (20 ms * 500
loops). Add code similar to what's done in other places in the driver
to check for unplug and bail.
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Grant Grundler <grundler@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/usb/r8152.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 9888bc43e903..982f9ca03e7a 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -3663,6 +3663,8 @@ static void r8153b_ups_en(struct r8152 *tp, bool enable) int i; for (i = 0; i < 500; i++) { + if (test_bit(RTL8152_UNPLUG, &tp->flags)) + return; if (ocp_read_word(tp, MCU_TYPE_PLA, PLA_BOOT_CTRL) & AUTOLOAD_DONE) break; @@ -3703,6 +3705,8 @@ static void r8153c_ups_en(struct r8152 *tp, bool enable) int i; for (i = 0; i < 500; i++) { + if (test_bit(RTL8152_UNPLUG, &tp->flags)) + return; if (ocp_read_word(tp, MCU_TYPE_PLA, PLA_BOOT_CTRL) & AUTOLOAD_DONE) break; |