Skip to content
Snippets Groups Projects
Commit c4b8ecba authored by Jiasheng Jiang's avatar Jiasheng Jiang Committed by Greg Kroah-Hartman
Browse files

counter: stm32-timer-cnt: Add check for clk_enable()


[ Upstream commit 842c3755a6bfbfcafa4a1438078d2485a9eb1d87 ]

Add check for the return value of clk_enable() in order to catch the
potential exception.

Fixes: c5b84255 ("counter: stm32-timer-cnt: add power management support")
Fixes: ad29937e ("counter: Add STM32 Timer quadrature encoder")
Signed-off-by: default avatarJiasheng Jiang <jiashengjiangcool@gmail.com>
Link: https://lore.kernel.org/r/20241104191825.40155-1-jiashengjiangcool@gmail.com


Signed-off-by: default avatarWilliam Breathitt Gray <wbg@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 776f13ad
No related branches found
No related tags found
1 merge request!176🤖 Sync Bot: Update v6.12-ktn to Latest Stable Kernel (v6.12.4)
...@@ -214,11 +214,17 @@ static int stm32_count_enable_write(struct counter_device *counter, ...@@ -214,11 +214,17 @@ static int stm32_count_enable_write(struct counter_device *counter,
{ {
struct stm32_timer_cnt *const priv = counter_priv(counter); struct stm32_timer_cnt *const priv = counter_priv(counter);
u32 cr1; u32 cr1;
int ret;
if (enable) { if (enable) {
regmap_read(priv->regmap, TIM_CR1, &cr1); regmap_read(priv->regmap, TIM_CR1, &cr1);
if (!(cr1 & TIM_CR1_CEN)) if (!(cr1 & TIM_CR1_CEN)) {
clk_enable(priv->clk); ret = clk_enable(priv->clk);
if (ret) {
dev_err(counter->parent, "Cannot enable clock %d\n", ret);
return ret;
}
}
regmap_update_bits(priv->regmap, TIM_CR1, TIM_CR1_CEN, regmap_update_bits(priv->regmap, TIM_CR1, TIM_CR1_CEN,
TIM_CR1_CEN); TIM_CR1_CEN);
...@@ -816,7 +822,11 @@ static int __maybe_unused stm32_timer_cnt_resume(struct device *dev) ...@@ -816,7 +822,11 @@ static int __maybe_unused stm32_timer_cnt_resume(struct device *dev)
return ret; return ret;
if (priv->enabled) { if (priv->enabled) {
clk_enable(priv->clk); ret = clk_enable(priv->clk);
if (ret) {
dev_err(dev, "Cannot enable clock %d\n", ret);
return ret;
}
/* Restore registers that may have been lost */ /* Restore registers that may have been lost */
regmap_write(priv->regmap, TIM_SMCR, priv->bak.smcr); regmap_write(priv->regmap, TIM_SMCR, priv->bak.smcr);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment