diff options
| author | dfr <dfr@FreeBSD.org> | 1998-10-03 08:55:29 +0000 |
|---|---|---|
| committer | dfr <dfr@FreeBSD.org> | 1998-10-03 08:55:29 +0000 |
| commit | 94703cd86c33fbbf12d464bfab0485f176129245 (patch) | |
| tree | 3610a3cc765f5597433be815c678712b406005a9 /sys/kern/subr_bus.c | |
| parent | 590984c836f7b6807157d7a3ecc4061ee4a57088 (diff) | |
| download | FreeBSD-src-94703cd86c33fbbf12d464bfab0485f176129245.zip FreeBSD-src-94703cd86c33fbbf12d464bfab0485f176129245.tar.gz | |
Don't call DEVICE_DETACH directly, always go through the device_detach()
wrapper which checks to make sure the device isn't currently open.
Diffstat (limited to 'sys/kern/subr_bus.c')
| -rw-r--r-- | sys/kern/subr_bus.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 6bed837..f38f0f8 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: subr_bus.c,v 1.4 1998/07/22 08:35:52 dfr Exp $ + * $Id: subr_bus.c,v 1.5 1998/09/05 13:24:39 bde Exp $ */ #include <sys/param.h> @@ -202,7 +202,7 @@ devclass_delete_driver(devclass_t dc, driver_t *driver) for (dev = TAILQ_FIRST(&bus->children); dev; dev = TAILQ_NEXT(dev, link)) if (dev->driver == driver) { - if (error = DEVICE_DETACH(dev)) + if (error = device_detach(dev)) return error; device_set_driver(dev, NULL); } @@ -458,7 +458,7 @@ device_delete_child(device_t dev, device_t child) { int error; - if (error = DEVICE_DETACH(child)) + if (error = device_detach(child)) return error; if (child->devclass) devclass_delete_device(child->devclass, child); @@ -898,7 +898,7 @@ bus_generic_detach(device_t dev) for (child = TAILQ_FIRST(&dev->children); child; child = TAILQ_NEXT(child, link)) - DEVICE_DETACH(child); + device_detach(child); return 0; } |
