Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 347de6ba authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Mark Brown
Browse files

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: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Reviewed-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent ebd805cc

drivers/spi/spi-s3c64xx.c

+4 −4
Original line number Diff line number Diff line
@@ -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 */