| commit | fad8f9c0b28ff1b9c93ea91048c0be701407eb67 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Wed Nov 07 09:22:32 2012 +0100 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Wed Nov 07 09:22:32 2012 +0100 |
| tree | 427bd77d51c6f150a0f7284696185028a8b9b0c1 | |
| parent | 70324494b6f283311c5339fb1795fdec2d8850d9 [diff] | |
| parent | 45e5033851acfbad1a69dea12caba3adbb162a0a [diff] |
Merge branch 'spi-fix-s3c64xx' into spi-next
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index 01b2f56..57900a8 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c
@@ -1112,7 +1112,7 @@ 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",