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

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

diff --git a/drivers/spi/spi-ath79.c b/drivers/spi/spi-ath79.c
index 37bad952ab38a649ea86eedc52ac6e3df1b9a133..821bf7ac218d965411027e3ce7efe16ed8e3e567 100644 (file)
--- a/drivers/spi/spi-ath79.c
+++ b/drivers/spi/spi-ath79.c
@@ -231,7 +231,7 @@ static int ath79_spi_probe(struct platform_device *pdev)
                master->num_chipselect = pdata->num_chipselect;
        }
 
-       sp->bitbang.master = spi_master_get(master);
+       sp->bitbang.master = master;
        sp->bitbang.chipselect = ath79_spi_chipselect;
        sp->bitbang.txrx_word[SPI_MODE_0] = ath79_spi_txrx_mode0;
        sp->bitbang.setup_transfer = spi_bitbang_setup_transfer;