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

EHCI: Move locking to be only around actually critical section.

Browse Source
This commit is contained in:
Michael Lotz
2014-08-31 12:08:17 +02:00
parent 63cf3cfa11
commit d7626f8db3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/busses/usb/ehci.cpp
+3 -3
View File
@@ -2039,9 +2039,6 @@ EHCI::LinkQueueHead(ehci_qh *queueHead)
status_t status_t
EHCI::LinkInterruptQueueHead(ehci_qh *queueHead, Pipe *pipe) EHCI::LinkInterruptQueueHead(ehci_qh *queueHead, Pipe *pipe)
{ {
if (!Lock())
return B_ERROR;
uint8 interval = pipe->Interval(); uint8 interval = pipe->Interval();
if (pipe->Speed() == USB_SPEED_HIGHSPEED) { if (pipe->Speed() == USB_SPEED_HIGHSPEED) {
// Allow interrupts to be scheduled on each possible micro frame. // Allow interrupts to be scheduled on each possible micro frame.
@@ -2070,6 +2067,9 @@ EHCI::LinkInterruptQueueHead(ehci_qh *queueHead, Pipe *pipe)
if (interval > EHCI_INTERRUPT_ENTRIES_COUNT) if (interval > EHCI_INTERRUPT_ENTRIES_COUNT)
interval = EHCI_INTERRUPT_ENTRIES_COUNT; interval = EHCI_INTERRUPT_ENTRIES_COUNT;
if (!Lock())
return B_ERROR;
ehci_qh *interruptQueue = &fInterruptEntries[interval - 1].queue_head; ehci_qh *interruptQueue = &fInterruptEntries[interval - 1].queue_head;
queueHead->next_phy = interruptQueue->next_phy; queueHead->next_phy = interruptQueue->next_phy;
queueHead->next_log = interruptQueue->next_log; queueHead->next_log = interruptQueue->next_log;