diff options
| author | Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2013-10-21 15:42:49 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-22 10:34:30 +0200 |
| commit | 347de6bab4bd0166115a5c90491a05bf9df508ee (patch) | |
| tree | 01c59ebd8cb02265635177336ac2332d2c393f7f /drivers/spi | |
| parent | spi/s3c64xx: Factor transfer start out of enable/disable_cs() (diff) | |
| download | linux-347de6bab4bd0166115a5c90491a05bf9df508ee.tar.xz linux-347de6bab4bd0166115a5c90491a05bf9df508ee.zip | |
spi/s3c64xx: Do not ignore return value of spi_master_resume/suspend
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>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-s3c64xx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index 8e732a1b8a9b..435406b48fda 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c @@ -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 */ |