diff options
author | Douglas Anderson <dianders@chromium.org> | 2023-10-21 00:06:56 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2023-10-22 13:46:18 +0300 |
commit | dc90ba37a8c37042407fa6970b9830890cfe6047 (patch) | |
tree | 35cb519954b69309ff9eeace5923364134add81e /drivers | |
parent | b8d35024d4059ca550cba11ac9ab23a6c238d929 (diff) | |
download | linux-dc90ba37a8c37042407fa6970b9830890cfe6047.tar.xz |
r8152: Check for unplug in rtl_phy_patch_request()
If the adapter is unplugged while we're looping in
rtl_phy_patch_request() we could end up looping for 10 seconds (2 ms *
5000 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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/usb/r8152.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 656fe90734fc..9888bc43e903 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -4046,6 +4046,9 @@ static int rtl_phy_patch_request(struct r8152 *tp, bool request, bool wait) for (i = 0; wait && i < 5000; i++) { u32 ocp_data; + if (test_bit(RTL8152_UNPLUG, &tp->flags)) + break; + usleep_range(1000, 2000); ocp_data = ocp_reg_read(tp, OCP_PHY_PATCH_STAT); if ((ocp_data & PATCH_READY) ^ check) |