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

Fixed CID 1301: we should probably have the null check of defaultPipe before it

Browse Source 
is first dereferenced...


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27430 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ryan Leavengood
2008-09-12 04:44:55 +00:00
parent 0f3a576f7e
commit 1594b70bc1
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/bus_managers/usb/BusManager.cpp
+2 -1
View File
@@ -124,7 +124,6 @@ BusManager::AllocateDevice(Hub *parent, int8 hubAddress, uint8 hubPort,
TRACE(("USB BusManager: setting device address to %d\n", deviceAddress)); TRACE(("USB BusManager: setting device address to %d\n", deviceAddress));
ControlPipe *defaultPipe = _GetDefaultPipe(speed); ControlPipe *defaultPipe = _GetDefaultPipe(speed);
defaultPipe->SetHubInfo(hubAddress, hubPort);
if (!defaultPipe) { if (!defaultPipe) {
TRACE_ERROR(("USB BusManager: error getting the default pipe for speed %d\n", (int)speed)); TRACE_ERROR(("USB BusManager: error getting the default pipe for speed %d\n", (int)speed));
@@ -132,6 +131,8 @@ BusManager::AllocateDevice(Hub *parent, int8 hubAddress, uint8 hubPort,
return NULL; return NULL;
} }
defaultPipe->SetHubInfo(hubAddress, hubPort);
status_t result = B_ERROR; status_t result = B_ERROR;
for (int32 i = 0; i < 3; i++) { for (int32 i = 0; i < 3; i++) {
// Set the address of the device USB 1.1 spec p202 // Set the address of the device USB 1.1 spec p202