From 3e4517730db1dc9c3a4f7377edb6de926aa89582 Mon Sep 17 00:00:00 2001
From: Dmitry Baryshkov <dbaryshkov@gmail.com>
Date: Wed, 15 Oct 2008 22:03:11 -0700
Subject: [PATCH] --- yaml --- r: 114819 b: refs/heads/master c:
 c557fa3e4c156b8713c177d9dde08920130bf551 h: refs/heads/master i:   114817:
 5639c4e28795ab2efa3202fe74e62f2219c3fb3b   114815:
 b3dad57aaa4edd385c907c50a38bf650b42bbb68 v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/gpio/max7301.c | 18 ++++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index b3b834339aad..1a06b09fcc01 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4fd5463c43d75ec919e27abdcfde1b199c19541e
+refs/heads/master: c557fa3e4c156b8713c177d9dde08920130bf551
diff --git a/trunk/drivers/gpio/max7301.c b/trunk/drivers/gpio/max7301.c
index 1b5ad97b9e5b..8b24d784db93 100644
--- a/trunk/drivers/gpio/max7301.c
+++ b/trunk/drivers/gpio/max7301.c
@@ -255,10 +255,6 @@ static int __devinit max7301_probe(struct spi_device *spi)
 	ts->chip.dev = &spi->dev;
 	ts->chip.owner = THIS_MODULE;
 
-	ret = gpiochip_add(&ts->chip);
-	if (ret)
-		goto exit_destroy;
-
 	/*
 	 * tristate all pins in hardware and cache the
 	 * register values for later use.
@@ -269,17 +265,19 @@ static int __devinit max7301_probe(struct spi_device *spi)
 		max7301_write(spi, 0x08 + i, 0xAA);
 		ts->port_config[i] = 0xAA;
 		for (j = 0; j < 4; j++) {
-			int idx = ts->chip.base + (i - 1) * 4 + j;
-			ret = gpio_direction_input(idx);
+			int offset = (i - 1) * 4 + j;
+			ret = max7301_direction_input(&ts->chip, offset);
 			if (ret)
-				goto exit_remove;
-			gpio_free(idx);
+				goto exit_destroy;
 		}
 	}
+
+	ret = gpiochip_add(&ts->chip);
+	if (ret)
+		goto exit_destroy;
+
 	return ret;
 
-exit_remove:
-	gpiochip_remove(&ts->chip);
 exit_destroy:
 	dev_set_drvdata(&spi->dev, NULL);
 	mutex_destroy(&ts->lock);