Merge remote-tracking branch 'spi/topic/s3c24xx' into spi-next

[linux-block.git] / drivers / spi / spi-s3c24xx.c

diff --git a/drivers/spi/spi-s3c24xx.c b/drivers/spi/spi-s3c24xx.c
index d39589dba5c185255052d30e2d6e27a8466d20f3..0dc32a11bd3cd9ac657f9330858e29398876d96e 100644 (file)
--- a/drivers/spi/spi-s3c24xx.c
+++ b/drivers/spi/spi-s3c24xx.c
@@ -524,7 +524,7 @@ static int s3c24xx_spi_probe(struct platform_device *pdev)
        hw = spi_master_get_devdata(master);
        memset(hw, 0, sizeof(struct s3c24xx_spi));
 
-       hw->master = spi_master_get(master);
+       hw->master = master;
        hw->pdata = pdata = dev_get_platdata(&pdev->dev);
        hw->dev = &pdev->dev;