From c66e6e67284c2a97b91d40ffbdbb6a940eab9f19 Mon Sep 17 00:00:00 2001
From: Ben Gardner <gardner.ben@gmail.com>
Date: Tue, 4 Dec 2007 23:45:24 -0800
Subject: [PATCH] --- yaml --- r: 74610 b: refs/heads/master c:
 4670df831cb479ba57dd0fa0b8a9eb88cc7129be h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/char/cs5535_gpio.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c69ee36d4fa8..ed261dc48a68 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1dad166e88a5ddca0acf8f11dea0e2bd92d8bf3
+refs/heads/master: 4670df831cb479ba57dd0fa0b8a9eb88cc7129be
diff --git a/trunk/drivers/char/cs5535_gpio.c b/trunk/drivers/char/cs5535_gpio.c
index fe6d2407baed..c2d23cae9515 100644
--- a/trunk/drivers/char/cs5535_gpio.c
+++ b/trunk/drivers/char/cs5535_gpio.c
@@ -104,6 +104,11 @@ static ssize_t cs5535_gpio_write(struct file *file, const char __user *data,
 		for (j = 0; j < ARRAY_SIZE(rm); j++) {
 			if (c == rm[j].on) {
 				outl(m1, base + rm[j].wr_offset);
+				/* If enabling output, turn off AUX 1 and AUX 2 */
+				if (c == 'O') {
+					outl(m0, base + 0x10);
+					outl(m0, base + 0x14);
+				}
 				break;
 			} else if (c == rm[j].off) {
 				outl(m0, base + rm[j].wr_offset);