diff options
author | Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2013-10-21 09:42:49 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-10-22 04:34:30 -0400 |
commit | 347de6bab4bd0166115a5c90491a05bf9df508ee (patch) | |
tree | 01c59ebd8cb02265635177336ac2332d2c393f7f /drivers | |
parent | ebd805cc14bec607e74795b7933570f240508cb4 (diff) |
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')
-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) | |||
1477 | struct spi_master *master = dev_get_drvdata(dev); | 1477 | struct spi_master *master = dev_get_drvdata(dev); |
1478 | struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master); | 1478 | struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master); |
1479 | 1479 | ||
1480 | spi_master_suspend(master); | 1480 | int ret = spi_master_suspend(master); |
1481 | if (ret) | ||
1482 | return ret; | ||
1481 | 1483 | ||
1482 | /* Disable the clock */ | 1484 | /* Disable the clock */ |
1483 | clk_disable_unprepare(sdd->src_clk); | 1485 | clk_disable_unprepare(sdd->src_clk); |
@@ -1503,9 +1505,7 @@ static int s3c64xx_spi_resume(struct device *dev) | |||
1503 | 1505 | ||
1504 | s3c64xx_spi_hwinit(sdd, sdd->port_id); | 1506 | s3c64xx_spi_hwinit(sdd, sdd->port_id); |
1505 | 1507 | ||
1506 | spi_master_resume(master); | 1508 | return spi_master_resume(master); |
1507 | |||
1508 | return 0; | ||
1509 | } | 1509 | } |
1510 | #endif /* CONFIG_PM_SLEEP */ | 1510 | #endif /* CONFIG_PM_SLEEP */ |
1511 | 1511 | ||