diff options
author | dumbbell <dumbbell@FreeBSD.org> | 2015-10-20 19:52:59 +0000 |
---|---|---|
committer | dumbbell <dumbbell@FreeBSD.org> | 2015-10-20 19:52:59 +0000 |
commit | fff41eb460e1fb0d65ac2f413911ce6460ca8127 (patch) | |
tree | fd729bbc0f2aacb48e993bcd34b183ddc5445e8e /sys/dev/iicbus/iicbb.c | |
parent | 5807c0b063023542925bc5d870e1227559e0db26 (diff) | |
download | FreeBSD-src-fff41eb460e1fb0d65ac2f413911ce6460ca8127.zip FreeBSD-src-fff41eb460e1fb0d65ac2f413911ce6460ca8127.tar.gz |
iicbus: Use device_delete_children() instead of explicit child removal
If the bus is detached and deleted by a call to device_delete_child() or
device_delete_children() on a device higher in the tree, I²C children
were already detached and deleted. So the device_t pointer stored in sc
points to freed memory: we must not try to delete it again.
By using device_delete_children(), we let subr_bus.c figure out if there
are children to take care of.
While here, make sure iicbus_detach() and iicoc_detach() call
device_delete_children() too, to be safe.
Reviewed by: jhb, imp
Approved by: jhb, imp
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D3926
Diffstat (limited to 'sys/dev/iicbus/iicbb.c')
-rw-r--r-- | sys/dev/iicbus/iicbb.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/sys/dev/iicbus/iicbb.c b/sys/dev/iicbus/iicbb.c index 977d52a..ed1d7b8 100644 --- a/sys/dev/iicbus/iicbb.c +++ b/sys/dev/iicbus/iicbb.c @@ -149,22 +149,9 @@ iicbb_attach(device_t dev) static int iicbb_detach(device_t dev) { - struct iicbb_softc *sc = (struct iicbb_softc *)device_get_softc(dev); - device_t child; - - /* - * We need to save child because the detach indirectly causes - * sc->iicbus to be zeroed. Since we added the device - * unconditionally in iicbb_attach, we need to make sure we - * delete it here. See iicbb_child_detached. We need that - * callback in case newbus detached our children w/o detaching - * us (say iicbus is a module and unloaded w/o iicbb being - * unloaded). - */ - child = sc->iicbus; + bus_generic_detach(dev); - if (child) - device_delete_child(dev, child); + device_delete_children(dev); return (0); } |