From: Mark Brown <broonie@linaro.org>
Date: Fri, 27 Sep 2013 17:44:53 +0000 (+0100)
Subject: spi/s3c64xx: Check that clock enables succeed on runtime resume
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=8b06d5b8576d1df4122fa9ca40578ec7f094cb3e;p=deliverable%2Flinux.git

spi/s3c64xx: Check that clock enables succeed on runtime resume

Signed-off-by: Mark Brown <broonie@linaro.org>
---

diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 2e267ce9dc19..dd5ed13436e5 100644
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -1524,9 +1524,17 @@ static int s3c64xx_spi_runtime_resume(struct device *dev)
 {
 	struct spi_master *master = dev_get_drvdata(dev);
 	struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
+	int ret;
 
-	clk_prepare_enable(sdd->src_clk);
-	clk_prepare_enable(sdd->clk);
+	ret = clk_prepare_enable(sdd->src_clk);
+	if (ret != 0)
+		return ret;
+
+	ret = clk_prepare_enable(sdd->clk);
+	if (ret != 0) {
+		clk_disable_unprepare(sdd->src_clk);
+		return ret;
+	}
 
 	return 0;
 }