summaryrefslogtreecommitdiff
path: root/drivers/spi/spi-fsl-dspi.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-25 12:51:18 +0400
committerMark Brown <broonie@linaro.org>2013-10-25 12:51:18 +0400
commit9270d827de92ba638048ff6fad2ba9c01a492ba8 (patch)
treecbc586736137602b2b3c68cfce89126775a22769 /drivers/spi/spi-fsl-dspi.c
parent9fbeace73cb7c7b80de0411b4ba7b879a06e202d (diff)
parent9191546f69ddefe66e46bbe9ba8d1872bc226553 (diff)
downloadlinux-9270d827de92ba638048ff6fad2ba9c01a492ba8.tar.xz
Merge remote-tracking branch 'spi/fix/efm' into spi-linus
Diffstat (limited to 'drivers/spi/spi-fsl-dspi.c')
-rw-r--r--drivers/spi/spi-fsl-dspi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c
index 4e44575bd87a..4a223d6d23b8 100644
--- a/drivers/spi/spi-fsl-dspi.c
+++ b/drivers/spi/spi-fsl-dspi.c
@@ -450,7 +450,7 @@ static int dspi_probe(struct platform_device *pdev)
dspi = spi_master_get_devdata(master);
dspi->pdev = pdev;
- dspi->bitbang.master = spi_master_get(master);
+ dspi->bitbang.master = master;
dspi->bitbang.chipselect = dspi_chipselect;
dspi->bitbang.setup_transfer = dspi_setup_transfer;
dspi->bitbang.txrx_bufs = dspi_txrx_transfer;