From: Marc Zyngier <maz@misterjones.org>
Date: Wed, 26 May 2010 21:42:21 +0000 (-0700)
Subject: gpio: max732x: fix input configuration for open-drain pins
X-Git-Tag: v2.6.35-rc1~216
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a13c1868aa60ae7a2516b8d00ee8873dea587581;p=~shefty%2Frdma-dev.git

gpio: max732x: fix input configuration for open-drain pins

Fix a bug I noticed while hacking on the max732x driver for interrupt
support.  According to the datasheets, open-drain pins have to be
configured as output-high (which in that case is actually high impedance)
to be used as input.

Signed-off-by: Marc Zyngier <maz@misterjones.org>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/gpio/max732x.c b/drivers/gpio/max732x.c
index 26ff40110d9..9cad60f9e96 100644
--- a/drivers/gpio/max732x.c
+++ b/drivers/gpio/max732x.c
@@ -232,6 +232,13 @@ static int max732x_gpio_direction_input(struct gpio_chip *gc, unsigned off)
 		return -EACCES;
 	}
 
+	/*
+	 * Open-drain pins must be set to high impedance (which is
+	 * equivalent to output-high) to be turned into an input.
+	 */
+	if ((mask & chip->dir_output))
+		max732x_gpio_set_value(gc, off, 1);
+
 	return 0;
 }