svn commit: r308692 - head/sys/arm/ti

[Luiz Otavio O Souza]

Author: loos
Date: Tue Nov 15 18:57:25 2016
New Revision: 308692
URL: https://svnweb.freebsd.org/changeset/base/308692

Log:
  Fix ti_gpio_detach() to avoid crashing if something goes wrong.
  
  Sponsored by:	Rubicon Communication, LLC (Netgate)

Modified:
  head/sys/arm/ti/ti_gpio.c

Modified: head/sys/arm/ti/ti_gpio.c
==============================================================================
--- head/sys/arm/ti/ti_gpio.c	Tue Nov 15 18:22:50 2016	(r308691)
+++ head/sys/arm/ti/ti_gpio.c	Tue Nov 15 18:57:25 2016	(r308692)
@@ -710,7 +710,8 @@ ti_gpio_detach(device_t dev)
 	/* Disable all interrupts */
 	if (sc->sc_mem_res != NULL)
 		ti_gpio_intr_clr(sc, 0xffffffff);
-	gpiobus_detach_bus(dev);
+	if (sc->sc_busdev != NULL)
+		gpiobus_detach_bus(dev);
 	if (sc->sc_isrcs != NULL)
 		ti_gpio_pic_detach(sc);
 	/* Release the memory and IRQ resources. */
@@ -718,10 +719,12 @@ ti_gpio_detach(device_t dev)
 		bus_teardown_intr(dev, sc->sc_irq_res,
 		    sc->sc_irq_hdl);
 	}
-	bus_release_resource(dev, SYS_RES_IRQ, sc->sc_irq_rid,
-	    sc->sc_irq_res);
-	bus_release_resource(dev, SYS_RES_MEMORY, sc->sc_mem_rid,
-	    sc->sc_mem_res);
+	if (sc->sc_irq_res)
+		bus_release_resource(dev, SYS_RES_IRQ, sc->sc_irq_rid,
+		    sc->sc_irq_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);
 
 	return (0);