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

Fix ti_gpio_detach() to avoid crashing if something goes wrong.

Browse Source 
Sponsored by:	Rubicon Communication, LLC (Netgate)
This commit is contained in:
loos 2016-11-15 18:57:25 +00:00
parent 2fa3607305
commit 0253e5f064
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/arm/ti/ti_gpio.c
View File

@ -710,7 +710,8 @@ ti_gpio_detach(device_t dev)
/* Disable all interrupts */ /* Disable all interrupts */
if (sc->sc_mem_res != NULL) if (sc->sc_mem_res != NULL)
ti_gpio_intr_clr(sc, 0xffffffff); ti_gpio_intr_clr(sc, 0xffffffff);
gpiobus_detach_bus(dev); if (sc->sc_busdev != NULL)
gpiobus_detach_bus(dev);
if (sc->sc_isrcs != NULL) if (sc->sc_isrcs != NULL)
ti_gpio_pic_detach(sc); ti_gpio_pic_detach(sc);
/* Release the memory and IRQ resources. */ /* Release the memory and IRQ resources. */
@ -718,10 +719,12 @@ ti_gpio_detach(device_t dev)
bus_teardown_intr(dev, sc->sc_irq_res, bus_teardown_intr(dev, sc->sc_irq_res,
sc->sc_irq_hdl); sc->sc_irq_hdl);
} }
bus_release_resource(dev, SYS_RES_IRQ, sc->sc_irq_rid, if (sc->sc_irq_res)
sc->sc_irq_res); bus_release_resource(dev, SYS_RES_IRQ, sc->sc_irq_rid,
bus_release_resource(dev, SYS_RES_MEMORY, sc->sc_mem_rid, sc->sc_irq_res);
sc->sc_mem_res); if (sc->sc_mem_res)
bus_release_resource(dev, SYS_RES_MEMORY, sc->sc_mem_rid,
sc->sc_mem_res);
TI_GPIO_LOCK_DESTROY(sc); TI_GPIO_LOCK_DESTROY(sc);
return (0); return (0);