d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix two cases where a successful return from usbd_transfer() would

Browse Source 
be treated as an error and cause a transfer to be freed twice. This
can probably only happen at boot time when transfers are processed
synchronously.
This commit is contained in:
Ian Dowse 2004-08-29 02:35:59 +00:00
parent 83c457dc27
commit efe26acda8
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=134464
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/usb/usbdi.c
View File

@ -241,7 +241,7 @@ usbd_open_pipe_intr(usbd_interface_handle iface, u_int8_t address,
ipipe->repeat = 1;
err = usbd_transfer(xfer);
*pipe = ipipe;
if (err != USBD_IN_PROGRESS)
if (err != USBD_IN_PROGRESS && err)
goto bad2;
return (USBD_NORMAL_COMPLETION);
@ -1052,7 +1052,7 @@ usbd_do_request_async(usbd_device_handle dev, usb_device_request_t *req,
usbd_setup_default_xfer(xfer, dev, 0, USBD_DEFAULT_TIMEOUT, req,
data, UGETW(req->wLength), 0, usbd_do_request_async_cb);
err = usbd_transfer(xfer);
if (err != USBD_IN_PROGRESS) {
if (err != USBD_IN_PROGRESS && err) {
usbd_free_xfer(xfer);
return (err);
}