summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-sh-hspi.c
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@linux-m68k.org>2014-03-11 10:59:10 +0100
committerMark Brown <broonie@linaro.org>2014-03-11 10:42:58 +0000
commit3abf0edd2c16326727326c35704ab9cad0529eda (patch)
tree5041600f2baf983cc9603846f38d357809baa190 /drivers/spi/spi-sh-hspi.c
parentc3003ce144fe0279e4299030b1cfad6f4b39116a (diff)
downloadop-kernel-dev-3abf0edd2c16326727326c35704ab9cad0529eda.zip
op-kernel-dev-3abf0edd2c16326727326c35704ab9cad0529eda.tar.gz
spi: sh-hspi: Add missing call to pm_runtime_disable() in failure path
Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/spi/spi-sh-hspi.c')
-rw-r--r--drivers/spi/spi-sh-hspi.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/spi/spi-sh-hspi.c b/drivers/spi/spi-sh-hspi.c
index 180eecf..89cfedf 100644
--- a/drivers/spi/spi-sh-hspi.c
+++ b/drivers/spi/spi-sh-hspi.c
@@ -279,11 +279,13 @@ static int hspi_probe(struct platform_device *pdev)
ret = devm_spi_register_master(&pdev->dev, master);
if (ret < 0) {
dev_err(&pdev->dev, "spi_register_master error.\n");
- goto error1;
+ goto error2;
}
return 0;
+ error2:
+ pm_runtime_disable(&pdev->dev);
error1:
clk_put(clk);
error0:
OpenPOWER on IntegriCloud