Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

freebsd_network: Check for errors in usbd_transfer_submit.

Browse Source 
This way, transfers that fail to queue will have their callbacks
actually invoked.

Fixes hangs when trying to disable unplugged USB WiFi devices.
This commit is contained in:
Augustin Cavalier 2022-03-04 16:04:53 -05:00
parent 2398586d63
commit ce172b8e10
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libs/compat/freebsd_network/usb.cpp
View File

@ -413,20 +413,25 @@ usbd_transfer_submit(struct usb_xfer* xfer)
xfer->transferred_length = 0;
xfer->in_progress = true;
status_t status = B_NOT_SUPPORTED;
switch (xfer->type) {
case UE_BULK:
sUSB->queue_bulk_v(xfer->pipe, xfer->frames, xfer->nframes, usbd_callback, xfer);
status = sUSB->queue_bulk_v(xfer->pipe, xfer->frames, xfer->nframes, usbd_callback, xfer);
break;
case UE_INTERRUPT:
KASSERT(xfer->nframes == 1, ("invalid frame count for interrupt transfer"));
sUSB->queue_interrupt(xfer->pipe, xfer->frames[0].iov_base, xfer->frames[0].iov_len,
status = sUSB->queue_interrupt(xfer->pipe,
xfer->frames[0].iov_base, xfer->frames[0].iov_len,
usbd_callback, xfer);
break;
default:
panic("unhandled pipe type %d", xfer->type);
}
if (status != B_OK)
usbd_callback(xfer, status, NULL, 0);
}