Эх сурвалжийг харах

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>
Leilk Liu 10 жил өмнө
parent
commit
13da5a0b72

+ 11 - 2
drivers/spi/spi-mt65xx.c

@@ -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;
+
+	ret = clk_prepare_enable(mdata->spi_clk);
+	if (ret < 0) {
+		dev_err(dev, "failed to enable spi_clk (%d)\n", ret);
+		return ret;
+	}
 
 
-	return clk_prepare_enable(mdata->spi_clk);
+	return 0;
 }
 }
 #endif /* CONFIG_PM */
 #endif /* CONFIG_PM */