aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@linux-m68k.org>2014-03-11 05:59:10 -0400
committerMark Brown <broonie@linaro.org>2014-03-11 06:42:58 -0400
commit3abf0edd2c16326727326c35704ab9cad0529eda (patch)
tree5041600f2baf983cc9603846f38d357809baa190
parentc3003ce144fe0279e4299030b1cfad6f4b39116a (diff)
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>
-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 180eecf72428..89cfedf6d21a 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)
279 ret = devm_spi_register_master(&pdev->dev, master); 279 ret = devm_spi_register_master(&pdev->dev, master);
280 if (ret < 0) { 280 if (ret < 0) {
281 dev_err(&pdev->dev, "spi_register_master error.\n"); 281 dev_err(&pdev->dev, "spi_register_master error.\n");
282 goto error1; 282 goto error2;
283 } 283 }
284 284
285 return 0; 285 return 0;
286 286
287 error2:
288 pm_runtime_disable(&pdev->dev);
287 error1: 289 error1:
288 clk_put(clk); 290 clk_put(clk);
289 error0: 291 error0: