summaryrefslogtreecommitdiff
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-11-07 09:22:32 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-11-07 09:22:32 +0100
commitfad8f9c0b28ff1b9c93ea91048c0be701407eb67 (patch)
tree427bd77d51c6f150a0f7284696185028a8b9b0c1 /drivers/spi
parent70324494b6f283311c5339fb1795fdec2d8850d9 (diff)
parent45e5033851acfbad1a69dea12caba3adbb162a0a (diff)
Merge branch 'spi-fix-s3c64xx' into spi-next
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-s3c64xx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 01b2f56a852e..57900a810bf2 100644
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -1112,7 +1112,7 @@ static int s3c64xx_spi_parse_dt_gpio(struct s3c64xx_spi_driver_data *sdd)
dev_err(dev, "invalid gpio[%d]: %d\n", idx, gpio);
goto free_gpio;
}
-
+ sdd->gpios[idx] = gpio;
ret = gpio_request(gpio, "spi-bus");
if (ret) {
dev_err(dev, "gpio [%d] request failed: %d\n",