diff options
| author | Douglas Anderson <dianders@chromium.org> | 2023-10-20 14:06:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-11-08 14:09:03 +0100 |
| commit | b233d39f7e15011561b372f6024704186a24f8d0 (patch) | |
| tree | 80cb75db4c877ec9fce9ad7a2731613a4cb371bf /drivers/net/usb | |
| parent | 19471af243b232aa796fb3f2d7b690feb241cfe7 (diff) | |
| download | linux-stable-b233d39f7e15011561b372f6024704186a24f8d0.tar.gz linux-stable-b233d39f7e15011561b372f6024704186a24f8d0.tar.bz2 linux-stable-b233d39f7e15011561b372f6024704186a24f8d0.zip | |
r8152: Check for unplug in rtl_phy_patch_request()
[ Upstream commit dc90ba37a8c37042407fa6970b9830890cfe6047 ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/net/usb')
| -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 14497e5558bf..1a016eafaf12 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -4059,6 +4059,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) |