Skip to content

Commit

Permalink
r8152: Add RTL8152_INACCESSIBLE to r8156b_wait_loading_flash()
Browse files Browse the repository at this point in the history
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: 195aae3 ("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>
  • Loading branch information
Douglas Anderson authored and David S. Miller committed Dec 4, 2023
1 parent 32a574c commit 8a67b47
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions drivers/net/usb/r8152.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 8a67b47

Please sign in to comment.