From: Mark Brown <broonie@kernel.org>
Date: Fri, 9 Oct 2020 15:01:22 +0000 (+0100)
Subject: Merge remote-tracking branch 'spi/for-5.10' into spi-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=988731181359efd771ae967f94936906fa38868a;p=linux.git

Merge remote-tracking branch 'spi/for-5.10' into spi-next
---

988731181359efd771ae967f94936906fa38868a
diff --cc drivers/spi/spi-imx.c
index e38e5ad3c7068,5158c48bd4dbb..060b1f5c9b048
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@@ -1707,11 -1709,9 +1709,9 @@@ static int spi_imx_probe(struct platfor
  	ret = spi_bitbang_start(&spi_imx->bitbang);
  	if (ret) {
  		dev_err(&pdev->dev, "bitbang start failed with %d\n", ret);
 -		goto out_runtime_pm_put;
 +		goto out_bitbang_start;
  	}
  
- 	dev_info(&pdev->dev, "probed\n");
- 
  	pm_runtime_mark_last_busy(spi_imx->dev);
  	pm_runtime_put_autosuspend(spi_imx->dev);