From: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Date: Tue, 11 Mar 2014 09:59:10 +0000 (+0100)
Subject: spi: sh-hspi: Add missing call to pm_runtime_disable() in failure path
X-Git-Tag: MMI-PSA29.97-13-9~12508^2~2^4
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3abf0edd2c16326727326c35704ab9cad0529eda;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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>
---

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)
 	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: