]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
spi/s3c64xx: Do not ignore return value of spi_master_resume/suspend
authorKrzysztof Kozlowski <k.kozlowski@samsung.com>
Mon, 21 Oct 2013 13:42:49 +0000 (15:42 +0200)
committerMark Brown <broonie@linaro.org>
Tue, 22 Oct 2013 08:34:30 +0000 (09:34 +0100)
During PM resume and suspend do not ignore the return value of
spi_master_suspend() or spi_master_resume(). Instead pass it further.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
drivers/spi/spi-s3c64xx.c

index 8e732a1b8a9b466c1af0320a17a62bb1f9d556b1..435406b48fda347cf3f02e5277d4483c9b50e649 100644 (file)
@@ -1477,7 +1477,9 @@ static int s3c64xx_spi_suspend(struct device *dev)
        struct spi_master *master = dev_get_drvdata(dev);
        struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
 
-       spi_master_suspend(master);
+       int ret = spi_master_suspend(master);
+       if (ret)
+               return ret;
 
        /* Disable the clock */
        clk_disable_unprepare(sdd->src_clk);
@@ -1503,9 +1505,7 @@ static int s3c64xx_spi_resume(struct device *dev)
 
        s3c64xx_spi_hwinit(sdd, sdd->port_id);
 
-       spi_master_resume(master);
-
-       return 0;
+       return spi_master_resume(master);
 }
 #endif /* CONFIG_PM_SLEEP */