diff options
| author | Douglas Anderson <dianders@chromium.org> | 2023-11-29 13:25:22 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-12-04 12:22:01 +0000 |
| commit | 8a67b47fced9f6a84101eb9ec5ce4c7d64204bc7 (patch) | |
| tree | b9b41ae9842cbc4ffa9b4f155655957b054cfa62 | |
| parent | 32a574c7e2685aa8138754d4d755f9246cc6bd48 (diff) | |
| download | lwn-8a67b47fced9f6a84101eb9ec5ce4c7d64204bc7.tar.gz lwn-8a67b47fced9f6a84101eb9ec5ce4c7d64204bc7.zip | |
r8152: Add RTL8152_INACCESSIBLE to r8156b_wait_loading_flash()
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
r8156b_wait_loading_flash().
Fixes: 195aae321c82 ("r8152: support new chips")
Reviewed-by: Grant Grundler <grundler@chromium.org>
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Acked-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/usb/r8152.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index e9955701f455..c4dd81e2421f 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -5521,6 +5521,8 @@ static void r8156b_wait_loading_flash(struct r8152 *tp) int i; for (i = 0; i < 100; i++) { + if (test_bit(RTL8152_INACCESSIBLE, &tp->flags)) + break; if (ocp_read_word(tp, MCU_TYPE_USB, USB_GPHY_CTRL) & GPHY_PATCH_DONE) break; usleep_range(1000, 2000); |