svn commit: r259036 - head/sys/dev/gpio

Luiz Otavio O Souza loos at FreeBSD.org
Fri Dec 6 17:56:20 UTC 2013


Author: loos
Date: Fri Dec  6 17:56:20 2013
New Revision: 259036
URL: http://svnweb.freebsd.org/changeset/base/259036

Log:
  Move the GPIOBUS_SET_PINFLAGS(..., ..., pin, GPIO_PIN_OUTPUT) to led(4)
  control callback function.  This makes gpioled(4) works even if the pin
  is accidentally set to an input.
  
  Approved by:	adrian (mentor)

Modified:
  head/sys/dev/gpio/gpioled.c

Modified: head/sys/dev/gpio/gpioled.c
==============================================================================
--- head/sys/dev/gpio/gpioled.c	Fri Dec  6 17:49:34 2013	(r259035)
+++ head/sys/dev/gpio/gpioled.c	Fri Dec  6 17:56:20 2013	(r259036)
@@ -75,6 +75,8 @@ gpioled_control(void *priv, int onoff)
 	GPIOLED_LOCK(sc);
 	GPIOBUS_LOCK_BUS(sc->sc_busdev);
 	GPIOBUS_ACQUIRE_BUS(sc->sc_busdev, sc->sc_dev);
+	GPIOBUS_PIN_SETFLAGS(sc->sc_busdev, sc->sc_dev, GPIOLED_PIN,
+	    GPIO_PIN_OUTPUT);
 	GPIOBUS_PIN_SET(sc->sc_busdev, sc->sc_dev, GPIOLED_PIN, 
 	    onoff ? GPIO_PIN_HIGH : GPIO_PIN_LOW);
 	GPIOBUS_RELEASE_BUS(sc->sc_busdev, sc->sc_dev);
@@ -103,9 +105,6 @@ gpioled_attach(device_t dev)
 	    device_get_unit(dev), "name", &name))
 		name = NULL;
 
-	GPIOBUS_PIN_SETFLAGS(sc->sc_busdev, sc->sc_dev, GPIOLED_PIN,
-	    GPIO_PIN_OUTPUT);
-
 	sc->sc_leddev = led_create(gpioled_control, sc, name ? name :
 	    device_get_nameunit(dev));
 


More information about the svn-src-all mailing list