X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=drivers%2Fgpio%2Fmax7301.c;fp=drivers%2Fgpio%2Fmax7301.c;h=8b24d784db93e6bfda3e9b28440c10caab8173fa;hb=c557fa3e4c156b8713c177d9dde08920130bf551;hp=1b5ad97b9e5bdbd5c933df2f2c030bb700ae2787;hpb=4fd5463c43d75ec919e27abdcfde1b199c19541e;p=safe%2Fjmp%2Flinux-2.6

diff --git a/drivers/gpio/max7301.c b/drivers/gpio/max7301.c
index 1b5ad97..8b24d78 100644
--- a/drivers/gpio/max7301.c
+++ b/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);