Merge remote-tracking branch 'leds/for-next'

[karo-tx-linux.git] / drivers / spi / spi-altera.c

diff --git a/drivers/spi/spi-altera.c b/drivers/spi/spi-altera.c
index 9a64c3fee218b152cb40365ea7f6bf1b4f7e39e7..595b62cb545d9f804a6fe64bc07c20a6a892892d 100644 (file)
--- a/drivers/spi/spi-altera.c
+++ b/drivers/spi/spi-altera.c
@@ -219,7 +219,7 @@ static int altera_spi_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, hw);
 
        /* setup the state for the bitbang driver */
-       hw->bitbang.master = spi_master_get(master);
+       hw->bitbang.master = master;
        if (!hw->bitbang.master)
                return err;
        hw->bitbang.chipselect = altera_spi_chipsel;