diff options
| author | James Morris <jmorris@namei.org> | 2009-03-26 17:28:11 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-03-26 17:28:11 -0400 |
| commit | 1987f17d2266e882862528841429b5bf67bc8fe5 (patch) | |
| tree | 5c3fbee88018ab7259a18c10e6320e575d0ed679 /drivers/spi/spi_gpio.c | |
| parent | 7198e2eeb44b3fe7cc97f997824002da47a9c644 (diff) | |
| parent | 0384e2959127a56d0640505d004d8dd92f9c29f5 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/spi/spi_gpio.c')
| -rw-r--r-- | drivers/spi/spi_gpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi_gpio.c b/drivers/spi/spi_gpio.c index f5ed9721aabb..d2866c293dee 100644 --- a/drivers/spi/spi_gpio.c +++ b/drivers/spi/spi_gpio.c | |||
| @@ -191,7 +191,7 @@ static int spi_gpio_setup(struct spi_device *spi) | |||
| 191 | return -EINVAL; | 191 | return -EINVAL; |
| 192 | 192 | ||
| 193 | if (!spi->controller_state) { | 193 | if (!spi->controller_state) { |
| 194 | status = gpio_request(cs, spi->dev.bus_id); | 194 | status = gpio_request(cs, dev_name(&spi->dev)); |
| 195 | if (status) | 195 | if (status) |
| 196 | return status; | 196 | return status; |
| 197 | status = gpio_direction_output(cs, spi->mode & SPI_CS_HIGH); | 197 | status = gpio_direction_output(cs, spi->mode & SPI_CS_HIGH); |