git: 03357811dec7 - stable/12 - ng_ubt: Do not clear stall before receiving of HCI command response.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 24 Nov 2022 23:17:37 UTC
The branch stable/12 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=03357811dec7ea46e804922dc07b34ac02b66fb9 commit 03357811dec7ea46e804922dc07b34ac02b66fb9 Author: Vladimir Kondratyev <wulf@FreeBSD.org> AuthorDate: 2021-04-15 14:25:00 +0000 Commit: Vladimir Kondratyev <wulf@FreeBSD.org> CommitDate: 2022-11-24 23:13:13 +0000 ng_ubt: Do not clear stall before receiving of HCI command response. Unconditional execution of "clear feature" request at SETUP stage was workaround for probe failures on ng_ubt.ko re-kldloading which is unnecessary now. Reviewed by: hselasky MFC after: 2 weeks Differential revision: https://reviews.freebsd.org/D29775 (cherry picked from commit 52489f2a55e625ea35bccc3749ca3adad6ce0c54) --- sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c index d641aadad60d..ef5bfc90114b 100644 --- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c +++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c @@ -827,8 +827,6 @@ ubt_probe_intr_callback(struct usb_xfer *xfer, usb_error_t error) case USB_ST_SETUP: submit_next: - /* Try clear stall first */ - usbd_xfer_set_stall(xfer); usbd_xfer_set_frame_len(xfer, 0, usbd_xfer_max_len(xfer)); usbd_transfer_submit(xfer); break; @@ -837,6 +835,8 @@ submit_next: if (error != USB_ERR_CANCELLED) { printf("ng_ubt: interrupt transfer failed: %s\n", usbd_errstr(error)); + /* Try clear stall first */ + usbd_xfer_set_stall(xfer); goto submit_next; } break;