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>

diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index f6d5fbb9dee07eb7ca08f183ef5b7769cff30757..15610d7d677ce7d07d9d4d63ca526cbe26af674e 100644 (file)
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -4051,6 +4051,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)