Module Name: src
Committed By: kardel
Date: Sun Jun 29 09:32:24 UTC 2014
Modified Files:
src/sys/dev/gpio: gpio.c
Log Message:
make implementation match gpio(4) man entry. do no change configuration
if no flags are be set (allows non-destructive inquiry via GPIOSET again).
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/gpio/gpio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/gpio/gpio.c
diff -u src/sys/dev/gpio/gpio.c:1.55 src/sys/dev/gpio/gpio.c:1.56
--- src/sys/dev/gpio/gpio.c:1.55 Fri May 23 13:57:04 2014
+++ src/sys/dev/gpio/gpio.c Sun Jun 29 09:32:24 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: gpio.c,v 1.55 2014/05/23 13:57:04 msaitoh Exp $ */
+/* $NetBSD: gpio.c,v 1.56 2014/06/29 09:32:24 kardel Exp $ */
/* $OpenBSD: gpio.c,v 1.6 2006/01/14 12:33:49 grange Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.55 2014/05/23 13:57:04 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.56 2014/06/29 09:32:24 kardel Exp $");
/*
* General Purpose Input/Output framework.
@@ -699,12 +699,14 @@ gpio_ioctl(struct gpio_softc *sc, u_long
/* check that the controller supports all requested flags */
if ((flags & sc->sc_pins[pin].pin_caps) != flags)
return ENODEV;
- flags = set->gp_flags | GPIO_PIN_SET;
+ flags = set->gp_flags;
set->gp_caps = sc->sc_pins[pin].pin_caps;
/* return old value */
set->gp_flags = sc->sc_pins[pin].pin_flags;
+
if (flags > 0) {
+ flags |= GPIO_PIN_SET;
gpiobus_pin_ctl(gc, pin, flags);
/* update current value */
sc->sc_pins[pin].pin_flags = flags;
