Author: jhb
Date: Mon Feb 27 16:08:18 2012
New Revision: 232218
URL: http://svn.freebsd.org/changeset/base/232218
Log:
Clear the a device's description string anytime it's driver changes.
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.
Modified:
head/sys/kern/subr_bus.c
Modified: head/sys/kern/subr_bus.c
==============================================================================
--- head/sys/kern/subr_bus.c Mon Feb 27 15:59:17 2012 (r232217)
+++ head/sys/kern/subr_bus.c Mon Feb 27 16:08:18 2012 (r232218)
@@ -1129,7 +1129,6 @@ devclass_driver_deleted(devclass_t buscl
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_
/* 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
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);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
