aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/spi/spi_s3c64xx_gpio.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/spi/spi_s3c64xx_gpio.c b/drivers/spi/spi_s3c64xx_gpio.c
index 446414f1569..4b6d1ef9b34 100644
--- a/drivers/spi/spi_s3c64xx_gpio.c
+++ b/drivers/spi/spi_s3c64xx_gpio.c
@@ -37,7 +37,7 @@ struct s3c64xx_spigpio {
static inline struct s3c64xx_spigpio *spidev_to_sg(struct spi_device *spi)
{
- return spi->controller_data;
+ return dev_get_drvdata(&spi->master->dev);
}
static inline void setsck(struct spi_device *dev, int on)
@@ -131,6 +131,8 @@ static int s3c64xx_spigpio_probe(struct platform_device *dev)
gpio_direction_output(info->pin_clk, 0);
s3c_gpio_cfgpin(info->pin_clk, S3C_GPIO_OUTPUT);
+ dev_set_drvdata(&master->dev, spi);
+
ret = spi_bitbang_start(&spi->bitbang);
if (ret)
goto err_no_bitbang;