diff options
| author | Douglas Anderson <dianders@chromium.org> | 2023-11-29 13:25:24 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-12-04 12:22:01 +0000 |
| commit | 79321a793945fdbff2f405f84712d0ab81bed287 (patch) | |
| tree | cc7ec9b4bce900530dc8ff130379ac2354edd21a /drivers/net/usb | |
| parent | 8c53a7bd706535a9cf4e2ec3a4e8d61d46353ca0 (diff) | |
| download | lwn-79321a793945fdbff2f405f84712d0ab81bed287.tar.gz lwn-79321a793945fdbff2f405f84712d0ab81bed287.zip | |
r8152: Add RTL8152_INACCESSIBLE to r8153_aldps_en()
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 r8153_aldps_en().
Fixes: 4214cc550bf9 ("r8152: check if disabling ALDPS is finished")
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>
Diffstat (limited to 'drivers/net/usb')
| -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 3958eb622d47..fcdc9ba0f826 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -5803,6 +5803,8 @@ static void r8153_aldps_en(struct r8152 *tp, bool enable) data &= ~EN_ALDPS; ocp_reg_write(tp, OCP_POWER_CFG, data); for (i = 0; i < 20; i++) { + if (test_bit(RTL8152_INACCESSIBLE, &tp->flags)) + return; usleep_range(1000, 2000); if (ocp_read_word(tp, MCU_TYPE_PLA, 0xe000) & 0x0100) break; |