Skip to content

Commit

Permalink
spi/s3c64xx: Do not ignore return value of spi_master_resume/suspend
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Krzysztof Kozlowski authored and Mark Brown committed Oct 22, 2013
1 parent ebd805c commit 347de6b
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/spi/spi-s3c64xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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 */

Expand Down

0 comments on commit 347de6b

Please sign in to comment.