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

return a proper error after the panic when no device is found, and avoid a leak. Shouldn't happen anyway, but doesn't hurt.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28803 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol 2008-12-13 02:30:07 +00:00
parent 8214934cdc
commit 7c9f1243c4
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/add-ons/kernel/bus_managers/pci/pci_device.cpp
View File

@ -119,14 +119,17 @@ pci_device_init_driver(device_node* node, void** _cookie)
&function, false) != B_OK)
return B_ERROR;
PCIDev *dev = gPCI->FindDevice(domain, bus, deviceNumber, function);
if (dev == NULL) {
panic("device not found!\n");
return ENODEV;
}
pci_device* device = (pci_device*)malloc(sizeof(*device));
if (device == NULL)
return B_NO_MEMORY;
device->device = gPCI->FindDevice(domain, bus, deviceNumber, function);
if (device->device == NULL)
panic("device not found!\n");
device->device = dev;
device->node = node;
*_cookie = device;