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

Move mutex initialization earlier, analogous to hrev43320.

Browse Source 
Avoids crashing if the bus manager init fails. Also fixes CID 10846.
This commit is contained in:
Michael Lotz
2011-12-05 03:00:24 +01:00
parent a395486027
commit ebdb8247fd
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/busses/usb/ehci.cpp
+4 -3
View File
@@ -109,6 +109,7 @@ EHCI::EHCI(pci_info *info, Stack *stack)
fPCIInfo(info), fPCIInfo(info),
fStack(stack), fStack(stack),
fEnabledInterrupts(0), fEnabledInterrupts(0),
fThreshold(0),
fPeriodicFrameListArea(-1), fPeriodicFrameListArea(-1),
fPeriodicFrameList(NULL), fPeriodicFrameList(NULL),
fInterruptEntries(NULL), fInterruptEntries(NULL),
@@ -136,6 +137,9 @@ EHCI::EHCI(pci_info *info, Stack *stack)
fPortSuspendChange(0), fPortSuspendChange(0),
fInterruptPollThread(-1) fInterruptPollThread(-1)
{ {
// Create a lock for the isochronous transfer list
mutex_init(&fIsochronousLock, "EHCI isochronous lock");
if (BusManager::InitCheck() < B_OK) { if (BusManager::InitCheck() < B_OK) {
TRACE_ERROR("bus manager failed to init\n"); TRACE_ERROR("bus manager failed to init\n");
return; return;
@@ -305,9 +309,6 @@ EHCI::EHCI(pci_info *info, Stack *stack)
B_NORMAL_PRIORITY, (void *)this); B_NORMAL_PRIORITY, (void *)this);
resume_thread(fFinishThread); resume_thread(fFinishThread);
// Create a lock for the isochronous transfer list
mutex_init(&fIsochronousLock, "EHCI isochronous lock");
// Create semaphore the isochronous finisher thread will wait for // Create semaphore the isochronous finisher thread will wait for
fFinishIsochronousTransfersSem = create_sem(0, fFinishIsochronousTransfersSem = create_sem(0,
"EHCI Isochronous Finish Transfers"); "EHCI Isochronous Finish Transfers");