diff options
| author | Chunfeng Yun <chunfeng.yun@mediatek.com> | 2021-05-12 10:07:38 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-22 10:38:29 +0200 |
| commit | 4e4620fee76562b05cc1ae670817c8bbdf2d9eb4 (patch) | |
| tree | d62742bf55aff719a7b0ae43b1936ead5c7fc493 | |
| parent | c4ed56cd72eed867603911d3d43a6eb593066666 (diff) | |
| download | linux-stable-4e4620fee76562b05cc1ae670817c8bbdf2d9eb4.tar.gz linux-stable-4e4620fee76562b05cc1ae670817c8bbdf2d9eb4.tar.bz2 linux-stable-4e4620fee76562b05cc1ae670817c8bbdf2d9eb4.zip | |
usb: core: hub: fix race condition about TRSMRCY of resume
commit 975f94c7d6c306b833628baa9aec3f79db1eb3a1 upstream.
This may happen if the port becomes resume status exactly
when usb_port_resume() gets port status, it still need provide
a TRSMCRY time before access the device.
CC: <stable@vger.kernel.org>
Reported-by: Tianping Fang <tianping.fang@mediatek.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
Link: https://lore.kernel.org/r/20210512020738.52961-1-chunfeng.yun@mediatek.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/core/hub.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index c422b4df97e8..6e2bf3e69a0a 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -3430,9 +3430,6 @@ int usb_port_resume(struct usb_device *udev, pm_message_t msg) * sequence. */ status = hub_port_status(hub, port1, &portstatus, &portchange); - - /* TRSMRCY = 10 msec */ - msleep(10); } SuspendCleared: @@ -3447,6 +3444,9 @@ int usb_port_resume(struct usb_device *udev, pm_message_t msg) usb_clear_port_feature(hub->hdev, port1, USB_PORT_FEAT_C_SUSPEND); } + + /* TRSMRCY = 10 msec */ + msleep(10); } if (udev->persist_enabled && hub_is_superspeed(hub->hdev)) |