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-imx.c | |
| parent | 9fbeace73cb7c7b80de0411b4ba7b879a06e202d (diff) | |
| parent | 9191546f69ddefe66e46bbe9ba8d1872bc226553 (diff) | |
Merge remote-tracking branch 'spi/fix/efm' into spi-linus
Diffstat (limited to 'drivers/spi/spi-imx.c')
| -rw-r--r-- | drivers/spi/spi-imx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index 15323d8bd9c..02d9f468b2b 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@ -786,7 +786,7 @@ static int spi_imx_probe(struct platform_device *pdev) master->num_chipselect = num_cs; spi_imx = spi_master_get_devdata(master); - spi_imx->bitbang.master = spi_master_get(master); + spi_imx->bitbang.master = master; for (i = 0; i < master->num_chipselect; i++) { int cs_gpio = of_get_named_gpio(np, "cs-gpios", i); |