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

[ig4] Handle controller startup errors

Browse Source 
Fail the attach on controller startup errors.  For some reason the
dell xps 13 says there's I2C controller, but the controller appears
to be permanente disabled and will refuse to enable.

Obtained from:	DragonflyBSD (509820b)
This commit is contained in:
Vladimir Kondratyev 2019-11-03 20:40:55 +00:00
parent 984ed3e493
commit bf9c3c58ca
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/dev/ichiic/ig4_iic.c
View File

@ -629,10 +629,18 @@ ig4iic_attach(ig4iic_softc_t *sc)
#endif
mtx_lock(&sc->io_lock);
if (set_controller(sc, 0))
if (set_controller(sc, 0)) {
device_printf(sc->dev, "controller error during attach-1\n");
if (set_controller(sc, IG4_I2C_ENABLE))
mtx_unlock(&sc->io_lock);
error = ENXIO;
goto done;
}
if (set_controller(sc, IG4_I2C_ENABLE)) {
device_printf(sc->dev, "controller error during attach-2\n");
mtx_unlock(&sc->io_lock);
error = ENXIO;
goto done;
}
mtx_unlock(&sc->io_lock);
error = bus_setup_intr(sc->dev, sc->intr_res, INTR_TYPE_MISC | INTR_MPSAFE,
NULL, ig4iic_intr, sc, &sc->intr_handle);