upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-02-19 02:30:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

vf_i2c: Don't hold a mutex across bus_generic_detach

Browse source 
This was also leaking the lock if bus_generic_detach failed.

Reviewed by:	imp
Differential Revision:	https://reviews.freebsd.org/D47221

(cherry picked from commit 13a1dbfed57b167a6dc4d68b60115eb0e070b9b6)
This commit is contained in:
John Baldwin 2024-10-31 15:49:41 -04:00
parent 82ee73e713
commit e09c819e6a
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sys/dev/iicbus/controller/vybrid/vf_i2c.c
View file

@ -207,13 +207,6 @@ i2c_detach(device_t dev)
sc = device_get_softc(dev);
vf_i2c_dbg(sc, "i2c detach\n");
mtx_lock(&sc->mutex);
if (sc->freq == 0) {
vf_i2c_dbg(sc, "Writing 0x00 to clock divider register\n");
WRITE1(sc, I2C_IBFD, 0x00);
}
error = bus_generic_detach(dev);
if (error != 0) {
device_printf(dev, "cannot detach child devices.\n");
@ -226,6 +219,13 @@ i2c_detach(device_t dev)
return (error);
}
mtx_lock(&sc->mutex);
if (sc->freq == 0) {
vf_i2c_dbg(sc, "Writing 0x00 to clock divider register\n");
WRITE1(sc, I2C_IBFD, 0x00);
}
bus_release_resources(dev, i2c_spec, sc->res);
mtx_unlock(&sc->mutex);