diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-25 09:51:18 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-25 09:51:18 +0100 |
| commit | 9270d827de92ba638048ff6fad2ba9c01a492ba8 (patch) | |
| tree | cbc586736137602b2b3c68cfce89126775a22769 /drivers/spi/spi-sirf.c | |
| parent | 9fbeace73cb7c7b80de0411b4ba7b879a06e202d (diff) | |
| parent | 9191546f69ddefe66e46bbe9ba8d1872bc226553 (diff) | |
Merge remote-tracking branch 'spi/fix/efm' into spi-linus
Diffstat (limited to 'drivers/spi/spi-sirf.c')
| -rw-r--r-- | drivers/spi/spi-sirf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-sirf.c b/drivers/spi/spi-sirf.c index a1f21b74773..592b4aff651 100644 --- a/drivers/spi/spi-sirf.c +++ b/drivers/spi/spi-sirf.c @@ -632,7 +632,7 @@ static int spi_sirfsoc_probe(struct platform_device *pdev) if (ret) goto free_master; - sspi->bitbang.master = spi_master_get(master); + sspi->bitbang.master = master; sspi->bitbang.chipselect = spi_sirfsoc_chipselect; sspi->bitbang.setup_transfer = spi_sirfsoc_setup_transfer; sspi->bitbang.txrx_bufs = spi_sirfsoc_transfer; |