summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorkardel <kardel@NetBSD.org>2014-06-29 09:32:24 +0000
committerkardel <kardel@NetBSD.org>2014-06-29 09:32:24 +0000
commit7dce091311f37e59db356ff3b3da0873abc81fee (patch)
tree6b1f841e9bd570a93c2ea269af6a03ea80f1c9aa /sys/dev
parent70a29008077d5add76d270806a92c66f7af269e4 (diff)
make implementation match gpio(4) man entry. do no change configuration
if no flags are being set (allows non-destructive inquiry via GPIOSET again).
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/gpio/gpio.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/dev/gpio/gpio.c b/sys/dev/gpio/gpio.c
index 11525e3e3fa..d7f766811c7 100644
--- a/sys/dev/gpio/gpio.c
+++ b/sys/dev/gpio/gpio.c
@@ -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 cmd, void *data, int flag,
/* 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;