summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-fsl-lpspi.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2019-11-22 19:56:33 +0000
committerMark Brown <broonie@kernel.org>2019-11-22 19:56:33 +0000
commit8f3ed6d0b0db04db8297d951c26c809dd7b4778d (patch)
tree5813c89fa9245eb00e617b6dab89ddfe4a029184 /drivers/spi/spi-fsl-lpspi.c
parentaf42d3466bdc8f39806b26f593604fdc54140bcb (diff)
parentc5923243eb3208ea63b5ed7905610039c4ca5201 (diff)
downloadtalos-op-linux-8f3ed6d0b0db04db8297d951c26c809dd7b4778d.tar.gz
talos-op-linux-8f3ed6d0b0db04db8297d951c26c809dd7b4778d.zip
Merge branch 'spi-5.4' into spi-linus
Diffstat (limited to 'drivers/spi/spi-fsl-lpspi.c')
-rw-r--r--drivers/spi/spi-fsl-lpspi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-fsl-lpspi.c b/drivers/spi/spi-fsl-lpspi.c
index d08e9324140e..3528ed5eea9b 100644
--- a/drivers/spi/spi-fsl-lpspi.c
+++ b/drivers/spi/spi-fsl-lpspi.c
@@ -938,7 +938,7 @@ static int fsl_lpspi_probe(struct platform_device *pdev)
ret = pm_runtime_get_sync(fsl_lpspi->dev);
if (ret < 0) {
dev_err(fsl_lpspi->dev, "failed to enable clock\n");
- return ret;
+ goto out_controller_put;
}
temp = readl(fsl_lpspi->base + IMX7ULP_PARAM);
OpenPOWER on IntegriCloud