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

Impose a one second timeout on all usb_disk data transfers. This should avoid

Browse Source 
hanging systems on boot, but probably just hides a problem somewhere else, as
the transfers should timeout on their own if the device doesn't respond.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26082 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz 2008-06-22 15:07:49 +00:00
parent 717b5b78ce
commit 27b95d52b8
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,8 +142,18 @@ usb_disk_transfer_data(disk_device *device, bool directionIn, void *data,
}
do {
result = acquire_sem(device->notify);
result = acquire_sem_etc(device->notify, 1, B_RELATIVE_TIMEOUT, 1000000);
if (result == B_TIMED_OUT) {
// Cancel the transfer and collect the sem that should now be
// released through the callback on cancel. Handling of device
// reset is done in usb_disk_operation() when it detects that
// the transfer failed.
gUSBModule->cancel_queued_transfers(directionIn ? device->bulk_in
: device->bulk_out);
continue;
}
} while (result == B_INTERRUPTED);
if (result != B_OK) {
TRACE_ALWAYS("acquire_sem failed while waiting for data transfer\n");
return result;