diff options
author | Leilk Liu <leilk.liu@mediatek.com> | 2015-08-23 23:45:17 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-08-25 13:48:23 -0400 |
commit | 13da5a0b72ea66c74483966ff91718ae0a9c0703 (patch) | |
tree | a314a4d23c8dc38270364ff1121807857ab8fd99 /drivers/spi/spi-mt65xx.c | |
parent | 50f8fec2162db918540d0845481f3f6fffc5b033 (diff) |
spi: mediatek: add PM clk_prepare_enable fail flow
This patch adds PM clk_prepare_enable fail flow.
Signed-off-by: Leilk Liu <leilk.liu@mediatek.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-mt65xx.c')
-rw-r--r-- | drivers/spi/spi-mt65xx.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/spi/spi-mt65xx.c b/drivers/spi/spi-mt65xx.c index 81b75b94145c..14112a5e63b9 100644 --- a/drivers/spi/spi-mt65xx.c +++ b/drivers/spi/spi-mt65xx.c | |||
@@ -665,8 +665,10 @@ static int mtk_spi_resume(struct device *dev) | |||
665 | 665 | ||
666 | if (!pm_runtime_suspended(dev)) { | 666 | if (!pm_runtime_suspended(dev)) { |
667 | ret = clk_prepare_enable(mdata->spi_clk); | 667 | ret = clk_prepare_enable(mdata->spi_clk); |
668 | if (ret < 0) | 668 | if (ret < 0) { |
669 | dev_err(dev, "failed to enable spi_clk (%d)\n", ret); | ||
669 | return ret; | 670 | return ret; |
671 | } | ||
670 | } | 672 | } |
671 | 673 | ||
672 | ret = spi_master_resume(master); | 674 | ret = spi_master_resume(master); |
@@ -692,8 +694,15 @@ static int mtk_spi_runtime_resume(struct device *dev) | |||
692 | { | 694 | { |
693 | struct spi_master *master = dev_get_drvdata(dev); | 695 | struct spi_master *master = dev_get_drvdata(dev); |
694 | struct mtk_spi *mdata = spi_master_get_devdata(master); | 696 | struct mtk_spi *mdata = spi_master_get_devdata(master); |
697 | int ret; | ||
698 | |||
699 | ret = clk_prepare_enable(mdata->spi_clk); | ||
700 | if (ret < 0) { | ||
701 | dev_err(dev, "failed to enable spi_clk (%d)\n", ret); | ||
702 | return ret; | ||
703 | } | ||
695 | 704 | ||
696 | return clk_prepare_enable(mdata->spi_clk); | 705 | return 0; |
697 | } | 706 | } |
698 | #endif /* CONFIG_PM */ | 707 | #endif /* CONFIG_PM */ |
699 | 708 | ||