[PATCH] spi: amlogic-spisg: check clk_prepare_enable() return value
Li Youhong
dayou5941 at 163.com
Mon Aug 31 02:45:53 PDT 2026
From: Li Youhong <liyouhong at kylinos.cn>
The driver ignored clk_prepare_enable() failures for sclk during
probe and for core/sclk during runtime resume. Propagate the errors
and, on resume, disable core if enabling sclk fails, so probe/resume
do not continue with clocks disabled or report success falsely.
Fixes: cef9991e04ae ("spi: Add Amlogic SPISG driver")
Signed-off-by: Li Youhong <liyouhong at kylinos.cn>
---
drivers/spi/spi-amlogic-spisg.c | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/drivers/spi/spi-amlogic-spisg.c b/drivers/spi/spi-amlogic-spisg.c
index afc8af04638d..71b73df1b5ca 100644
--- a/drivers/spi/spi-amlogic-spisg.c
+++ b/drivers/spi/spi-amlogic-spisg.c
@@ -704,7 +704,9 @@ static int aml_spisg_clk_init(struct spisg_device *spisg, void __iomem *base)
return PTR_ERR(spisg->sclk);
}
- clk_prepare_enable(spisg->sclk);
+ ret = clk_prepare_enable(spisg->sclk);
+ if (ret)
+ return ret;
return 0;
}
@@ -841,9 +843,18 @@ static int spisg_suspend_runtime(struct device *dev)
static int spisg_resume_runtime(struct device *dev)
{
struct spisg_device *spisg = dev_get_drvdata(dev);
+ int ret;
+
+ ret = clk_prepare_enable(spisg->core);
+ if (ret)
+ return ret;
+
+ ret = clk_prepare_enable(spisg->sclk);
+ if (ret) {
+ clk_disable_unprepare(spisg->core);
+ return ret;
+ }
- clk_prepare_enable(spisg->core);
- clk_prepare_enable(spisg->sclk);
pinctrl_pm_select_default_state(&spisg->pdev->dev);
return 0;
--
2.25.1
More information about the linux-amlogic
mailing list