a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spi: mediatek: add PM clk_prepare_enable fail flow

Browse Source 
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>
This commit is contained in:
Leilk Liu 2015-08-24 11:45:17 +08:00 committed by Mark Brown
parent 50f8fec216
commit 13da5a0b72
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/spi/spi-mt65xx.c
View File

@ -665,8 +665,10 @@ static int mtk_spi_resume(struct device *dev)
if (!pm_runtime_suspended(dev)) { if (!pm_runtime_suspended(dev)) {
ret = clk_prepare_enable(mdata->spi_clk); ret = clk_prepare_enable(mdata->spi_clk);
if (ret < 0) if (ret < 0) {
dev_err(dev, "failed to enable spi_clk (%d)\n", ret);
return ret; return ret;
}
} }
ret = spi_master_resume(master); ret = spi_master_resume(master);
@ -692,8 +694,15 @@ static int mtk_spi_runtime_resume(struct device *dev)
{ {
struct spi_master *master = dev_get_drvdata(dev); struct spi_master *master = dev_get_drvdata(dev);
struct mtk_spi *mdata = spi_master_get_devdata(master); struct mtk_spi *mdata = spi_master_get_devdata(master);
int ret;
return clk_prepare_enable(mdata->spi_clk); ret = clk_prepare_enable(mdata->spi_clk);
if (ret < 0) {
dev_err(dev, "failed to enable spi_clk (%d)\n", ret);
return ret;
}
return 0;
} }
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */