svn commit: r310862 - stable/11/sys/arm/ti

Luiz Otavio O Souza loos at FreeBSD.org
Fri Dec 30 20:48:23 UTC 2016


Author: loos
Date: Fri Dec 30 20:48:22 2016
New Revision: 310862
URL: https://svnweb.freebsd.org/changeset/base/310862

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

Modified:
  stable/11/sys/arm/ti/ti_gpio.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/arm/ti/ti_gpio.c
==============================================================================
--- stable/11/sys/arm/ti/ti_gpio.c	Fri Dec 30 20:45:27 2016	(r310861)
+++ stable/11/sys/arm/ti/ti_gpio.c	Fri Dec 30 20:48:22 2016	(r310862)
@@ -782,7 +782,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);
 #ifdef	INTRNG
 	if (sc->sc_isrcs != NULL)
 		ti_gpio_pic_detach(sc);
@@ -801,10 +802,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);


More information about the svn-src-all mailing list