From 7ea6b5f8f5494371b8b620ed7d4ed56c34336ced Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Thu, 1 Dec 2011 09:49:07 +0800
Subject: [PATCH] --- yaml --- r: 284564 b: refs/heads/master c:
 97f2bf519377598fd75ce281e595e3205e0f48f5 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/mfd/dm355evm_msp.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 467c6a14d9c9..2aa11b83d388 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aced760d91ea20ee55d9ba90fff44764a2c2c535
+refs/heads/master: 97f2bf519377598fd75ce281e595e3205e0f48f5
diff --git a/trunk/drivers/mfd/dm355evm_msp.c b/trunk/drivers/mfd/dm355evm_msp.c
index 8ad88da647b9..7710227d284e 100644
--- a/trunk/drivers/mfd/dm355evm_msp.c
+++ b/trunk/drivers/mfd/dm355evm_msp.c
@@ -308,8 +308,7 @@ static int add_children(struct i2c_client *client)
 	for (i = 0; i < ARRAY_SIZE(config_inputs); i++) {
 		int gpio = dm355evm_msp_gpio.base + config_inputs[i].offset;
 
-		gpio_request(gpio, config_inputs[i].label);
-		gpio_direction_input(gpio);
+		gpio_request_one(gpio, GPIOF_IN, config_inputs[i].label);
 
 		/* make it easy for userspace to see these */
 		gpio_export(gpio, false);