X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fspi%2Fspi_s3c24xx_gpio.c;h=8bb2b4ee3e50d3a8b0967caa599c981904789661;hb=e39ea8a2def1fcb203ed0183317124348962e351;hp=cc1f647f579bc3019302a4c430ee71d946afd454;hpb=4e253d23003b54c88d0919d6088be74f00eec3c7;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/spi/spi_s3c24xx_gpio.c b/drivers/spi/spi_s3c24xx_gpio.c
index cc1f647f579..8bb2b4ee3e5 100644
--- a/drivers/spi/spi_s3c24xx_gpio.c
+++ b/drivers/spi/spi_s3c24xx_gpio.c
@@ -34,7 +34,7 @@ struct s3c2410_spigpio {
 
 static inline struct s3c2410_spigpio *spidev_to_sg(struct spi_device *spi)
 {
-	return spi->controller_data;
+	return spi_master_get_devdata(spi->master);
 }
 
 static inline void setsck(struct spi_device *dev, int on)