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

Clear the a device's description string anytime it's driver changes.

Browse Source 
Descriptions  are specific to drivers and we don't change drivers on attached
devices.  This fixes a few places where we were not clearing the description
when detaching a driver (e.g. with device_attach() failed).  While here, fix
a few other nits:
- Remove spurious call to remove a device's driver from
  devclass_driver_deleted().  device_detach() removes it already.
- Fix a typo.
This commit is contained in:
John Baldwin 2012-02-27 16:08:18 +00:00
parent 24c209494a
commit ef7b427562
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/kern/subr_bus.c
View File

@ -1129,7 +1129,6 @@ devclass_driver_deleted(devclass_t busclass, devclass_t dc, driver_t *driver)
dev->parent->devclass == busclass) {
if ((error = device_detach(dev)) != 0)
return (error);
(void)device_set_driver(dev, NULL);
BUS_PROBE_NOMATCH(dev->parent, dev);
devnomatch(dev);
dev->flags |= DF_DONENOMATCH;
@ -2097,7 +2096,7 @@ device_probe_child(device_t dev, device_t child)
/* XXX What happens if we rebid and got no best? */
if (best) {
/*
* If this device was atached, and we were asked to
* If this device was attached, and we were asked to
* rescan, and it is a different driver, then we have
* to detach the old driver and reattach this new one.
* Note, we don't have to check for DF_REBID here
@ -2604,6 +2603,7 @@ device_set_driver(device_t dev, driver_t *driver)
free(dev->softc, M_BUS_SC);
dev->softc = NULL;
}
device_set_desc(dev, NULL);
kobj_delete((kobj_t) dev, NULL);
dev->driver = driver;
if (driver) {
@ -2789,7 +2789,6 @@ device_detach(device_t dev)
dev->state = DS_NOTPRESENT;
(void)device_set_driver(dev, NULL);
device_set_desc(dev, NULL);
device_sysctl_fini(dev);
return (0);