Haiku/haiku
Haiku/haiku
1
0
Fork 0
mirror of https://review.haiku-os.org/haiku synced 2024-11-23 07:18:40 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

usb_disk: Cancel queued interrupt transfers on failure to attach.

Browse Source 
We reschedule the interrupt transfers every time they succeed,
so we need to cancel them on failure to attach in order to not
leave one lingering (and later KDL).

Fixes #17549 and related tickets.
This commit is contained in:
Augustin Cavalier 2024-11-07 01:07:48 -05:00
parent 2a46c1e589
commit eb2080d241
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/add-ons/kernel/drivers/disk/usb/usb_disk/usb_disk.cpp
View File

@ -405,7 +405,7 @@ usb_disk_operation_interrupt(device_lun *lun, uint8* operation,
// step 3 : wait for the device to send the interrupt ACK
if (operation[0] != SCSI_REQUEST_SENSE_6) {
interrupt_status_wrapper status;
result = receive_csw_interrupt(device, &status);
result = receive_csw_interrupt(device, &status);
if (result != B_OK) {
// in case of a stall or error clear the stall and try again
TRACE("Error receiving interrupt: %s. Retrying...\n",
@ -488,7 +488,7 @@ usb_disk_operation_bulk(device_lun *lun, uint8 *operation, size_t operationLengt
}
usb_massbulk_command_status_wrapper status;
result = receive_csw_bulk(device, &status);
result = receive_csw_bulk(device, &status);
if (result != B_OK) {
// in case of a stall or error clear the stall and try again
usb_disk_clear_halt(device->bulk_in);
@ -1214,6 +1214,9 @@ usb_disk_attach(device_node *node, usb_device newDevice, void **cookie)
if (result != B_OK) {
TRACE_ALWAYS("failed to initialize logical units: %s\n",
strerror(result));
if (device->is_ufi)
gUSBModule->cancel_queued_transfers(device->interrupt);
usb_disk_free_device_and_luns(device);
return result;
}