Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e01827e authored by Maxim Moseychuk's avatar Maxim Moseychuk Committed by Greg Kroah-Hartman
Browse files

usb: do not reset if a low-speed or full-speed device timed out 



Some low-speed and full-speed devices (for example, bluetooth)
do not have time to initialize. For them, ETIMEDOUT is a valid error.
We need to give them another try. Otherwise, they will
never be initialized correctly and in dmesg will be messages
"Bluetooth: hci0 command 0x1002 tx timeout" or similars.

Fixes: 264904cc ("usb: retry reset if a device times out")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarMaxim Moseychuk <franchesko.salias.hudro.pedros@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3f0989e4

drivers/usb/core/hub.c

+3 −1
Original line number Diff line number Diff line
@@ -4555,7 +4555,9 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, 
				 * reset. But only on the first attempt,

				 * lest we get into a time out/reset loop

				 */

				if (r == 0  || (r == -ETIMEDOUT && retries == 0))

				if (r == 0 || (r == -ETIMEDOUT &&

						retries == 0 &&

						udev->speed > USB_SPEED_FULL))

					break;

			}

			udev->descriptor.bMaxPacketSize0 =