Merge remote-tracking branch 'spi/fix/efm' into spi-linus

diff --combined drivers/spi/spi-fsl-dspi.c
index 4e44575bd87a9674c72338cafe25c1b5006ef529,d338b6722255eacb016f46e4deecc28a496211a4..4a223d6d23b84af5580e5d7fd8b139d12b2fc422
--- 1/drivers/spi/spi-fsl-dspi.c
--- 2/drivers/spi/spi-fsl-dspi.c
+++ b/drivers/spi/spi-fsl-dspi.c
@@@ -450,7 -450,7 +450,7 @@@ static int dspi_probe(struct platform_d
  
        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;
@@@ -476,9 -476,15 +476,9 @@@
        master->bus_num = bus_num;
  
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 -      if (!res) {
 -              dev_err(&pdev->dev, "can't get platform resource\n");
 -              ret = -EINVAL;
 -              goto out_master_put;
 -      }
 -
        dspi->base = devm_ioremap_resource(&pdev->dev, res);
 -      if (!dspi->base) {
 -              ret = -EINVAL;
 +      if (IS_ERR(dspi->base)) {
 +              ret = PTR_ERR(dspi->base);
                goto out_master_put;
        }