d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check for device_set_devclass() errors and skip driver probe/attach if any.

Browse Source 
Attach call without devclass set crashes the system.

On resume AHCI driver sometimes tries to create duplicate adX device.
It is surely his own problem, but IMHO it is not a reason to crash here.
Other reasons are also possible.
This commit is contained in:
mav 2009-02-10 23:22:29 +00:00
parent 556b4fb046
commit 26e8dd306f
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/kern/subr_bus.c
View File

@ -1756,8 +1756,13 @@ device_probe_child(device_t dev, device_t child)
dl = next_matching_driver(dc, child, dl)) {
PDEBUG(("Trying %s", DRIVERNAME(dl->driver)));
device_set_driver(child, dl->driver);
if (!hasclass)
device_set_devclass(child, dl->driver->name);
if (!hasclass) {
if (device_set_devclass(child, dl->driver->name)) {
PDEBUG(("Unable to set device class"));
device_set_driver(child, NULL);
continue;
}
}
/* Fetch any flags for the device before probing. */
resource_int_value(dl->driver->name, child->unit,
@ -1843,8 +1848,11 @@ device_probe_child(device_t dev, device_t child)
return (result);
/* Set the winning driver, devclass, and flags. */
if (!child->devclass)
device_set_devclass(child, best->driver->name);
if (!child->devclass) {
result = device_set_devclass(child, best->driver->name);
if (result != 0)
return (result);
}
device_set_driver(child, best->driver);
resource_int_value(best->driver->name, child->unit,
"flags", &child->devflags);