i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XHCI: Use MutexLocker in HandleTransferComplete.

Browse Source
This commit is contained in:
Augustin Cavalier
2019-03-13 00:32:25 -04:00
parent 1d79fe616f
commit dda9c02789
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/busses/usb/xhci.cpp
+2 -3
View File
@@ -2297,6 +2297,7 @@ XHCI::HandleTransferComplete(xhci_trb* trb)
// Use mutex_trylock first, in case we are in KDL. // Use mutex_trylock first, in case we are in KDL.
if (mutex_trylock(&endpoint->lock) != B_OK) if (mutex_trylock(&endpoint->lock) != B_OK)
mutex_lock(&endpoint->lock); mutex_lock(&endpoint->lock);
MutexLocker endpointLocker(endpoint->lock, true);
addr_t source = trb->qwtrb0; addr_t source = trb->qwtrb0;
uint8 completionCode = TRB_2_COMP_CODE_GET(trb->dwtrb2); uint8 completionCode = TRB_2_COMP_CODE_GET(trb->dwtrb2);
@@ -2317,7 +2318,7 @@ XHCI::HandleTransferComplete(xhci_trb* trb)
// likely failed midway; so just accept it anyway. // likely failed midway; so just accept it anyway.
if (offset == (td->trb_used - 1) || completionCode != COMP_SUCCESS) { if (offset == (td->trb_used - 1) || completionCode != COMP_SUCCESS) {
_UnlinkDescriptorForPipe(td, endpoint); _UnlinkDescriptorForPipe(td, endpoint);
mutex_unlock(&endpoint->lock); endpointLocker.Unlock();
td->trb_completion_code = completionCode; td->trb_completion_code = completionCode;
td->trb_left = remainder; td->trb_left = remainder;
@@ -2332,13 +2333,11 @@ XHCI::HandleTransferComplete(xhci_trb* trb)
release_sem_etc(fFinishTransfersSem, 1, B_DO_NOT_RESCHEDULE); release_sem_etc(fFinishTransfersSem, 1, B_DO_NOT_RESCHEDULE);
TRACE("HandleTransferComplete td %p done\n", td); TRACE("HandleTransferComplete td %p done\n", td);
} else { } else {
mutex_unlock(&endpoint->lock);
TRACE_ERROR("successful TRB %" B_PRIxADDR " was found, but it wasn't " TRACE_ERROR("successful TRB %" B_PRIxADDR " was found, but it wasn't "
"the last in the TD!\n", source); "the last in the TD!\n", source);
} }
return; return;
} }
mutex_unlock(&endpoint->lock);
TRACE_ERROR("TRB 0x%" B_PRIxADDR " was not found in the endpoint!\n", source); TRACE_ERROR("TRB 0x%" B_PRIxADDR " was not found in the endpoint!\n", source);
} }