Module Name: src
Committed By: mbalmer
Date: Mon May 20 15:46:41 UTC 2013
Modified Files:
src/sys/dev/gpio: gpio.c
Log Message:
When returning the old value, use the value read from the device.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 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.51 src/sys/dev/gpio/gpio.c:1.52
--- src/sys/dev/gpio/gpio.c:1.51 Wed Oct 17 21:35:39 2012
+++ src/sys/dev/gpio/gpio.c Mon May 20 15:46:41 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: gpio.c,v 1.51 2012/10/17 21:35:39 dyoung Exp $ */
+/* $NetBSD: gpio.c,v 1.52 2013/05/20 15:46:41 mbalmer 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.51 2012/10/17 21:35:39 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.52 2013/05/20 15:46:41 mbalmer Exp $");
/*
* General Purpose Input/Output framework.
@@ -562,9 +562,9 @@ gpio_ioctl(struct gpio_softc *sc, u_long
if (value != GPIO_PIN_LOW && value != GPIO_PIN_HIGH)
return EINVAL;
- gpiobus_pin_write(gc, pin, value);
/* return old value */
- req->gp_value = sc->sc_pins[pin].pin_state;
+ req->gp_value = gpiobus_pin_read(gc, pin);
+ gpiobus_pin_write(gc, pin, value);
/* update current value */
sc->sc_pins[pin].pin_state = value;
break;
