summaryrefslogtreecommitdiff
path: root/drivers/spi/spi-efm32.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-07 17:51:17 +0400
committerMark Brown <broonie@linaro.org>2013-10-07 17:51:17 +0400
commit77445a14d6a3a1f920e3b031603541fc807f5f9b (patch)
tree17a6a75a83fc602345969b29fdf7199afe2df526 /drivers/spi/spi-efm32.c
parent57841439b62e3ddb5ee50e765aa50330dde612d0 (diff)
parent702a4879ec337463f858c8ab467482cce260bf18 (diff)
downloadlinux-77445a14d6a3a1f920e3b031603541fc807f5f9b.tar.xz
Merge remote-tracking branch 'spi/topic/bitbang' into HEAD
Diffstat (limited to 'drivers/spi/spi-efm32.c')
-rw-r--r--drivers/spi/spi-efm32.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-efm32.c b/drivers/spi/spi-efm32.c
index 5b3117f69507..34ef44c77e8e 100644
--- a/drivers/spi/spi-efm32.c
+++ b/drivers/spi/spi-efm32.c
@@ -347,7 +347,7 @@ static int efm32_spi_probe(struct platform_device *pdev)
ddata = spi_master_get_devdata(master);
- ddata->bitbang.master = spi_master_get(master);
+ ddata->bitbang.master = master;
ddata->bitbang.chipselect = efm32_spi_chipselect;
ddata->bitbang.setup_transfer = efm32_spi_setup_transfer;
ddata->bitbang.txrx_bufs = efm32_spi_txrx_bufs;