This fixes the crashing bug #849. Unfortunately, it still crashes, just at a different location.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18815 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -1,13 +1,11 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2004-2005, Axel Dörfler, [email protected]. All rights reserved.
|
* Copyright 2004-2006, Axel Dörfler, [email protected]. All rights reserved.
|
||||||
* Copyright 2002-2004, Thomas Kurschel. All rights reserved.
|
* Copyright 2002-2004, Thomas Kurschel. All rights reserved.
|
||||||
*
|
*
|
||||||
* Distributed under the terms of the MIT License.
|
* Distributed under the terms of the MIT License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Part of PnP Manager
|
|
||||||
|
|
||||||
Scanning for consumers.
|
Scanning for consumers.
|
||||||
|
|
||||||
Logic to execute (re)scanning of nodes.
|
Logic to execute (re)scanning of nodes.
|
||||||
@@ -94,10 +92,16 @@ scan_bus(device_node_info *node, bool rescan)
|
|||||||
{
|
{
|
||||||
// busses can register their children themselves
|
// busses can register their children themselves
|
||||||
bus_module_info *interface;
|
bus_module_info *interface;
|
||||||
|
status_t status;
|
||||||
void *cookie;
|
void *cookie;
|
||||||
|
|
||||||
// load driver during rescan
|
// load driver during rescan
|
||||||
pnp_load_driver(node, NULL, (driver_module_info **)&interface, &cookie);
|
|
||||||
|
status = pnp_load_driver(node, NULL, (driver_module_info **)&interface, &cookie);
|
||||||
|
if (status < B_OK) {
|
||||||
|
// we couldn't load a driver that had already registered itself...
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
TRACE(("scan bus\n"));
|
TRACE(("scan bus\n"));
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user