diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-07 09:51:17 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-07 09:51:17 -0400 |
| commit | 77445a14d6a3a1f920e3b031603541fc807f5f9b (patch) | |
| tree | 17a6a75a83fc602345969b29fdf7199afe2df526 /drivers/spi/spi-efm32.c | |
| parent | 57841439b62e3ddb5ee50e765aa50330dde612d0 (diff) | |
| parent | 702a4879ec337463f858c8ab467482cce260bf18 (diff) | |
Merge remote-tracking branch 'spi/topic/bitbang' into HEAD
Diffstat (limited to 'drivers/spi/spi-efm32.c')
| -rw-r--r-- | drivers/spi/spi-efm32.c | 2 |
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) | |||
| 347 | 347 | ||
| 348 | ddata = spi_master_get_devdata(master); | 348 | ddata = spi_master_get_devdata(master); |
| 349 | 349 | ||
| 350 | ddata->bitbang.master = spi_master_get(master); | 350 | ddata->bitbang.master = master; |
| 351 | ddata->bitbang.chipselect = efm32_spi_chipselect; | 351 | ddata->bitbang.chipselect = efm32_spi_chipselect; |
| 352 | ddata->bitbang.setup_transfer = efm32_spi_setup_transfer; | 352 | ddata->bitbang.setup_transfer = efm32_spi_setup_transfer; |
| 353 | ddata->bitbang.txrx_bufs = efm32_spi_txrx_bufs; | 353 | ddata->bitbang.txrx_bufs = efm32_spi_txrx_bufs; |