mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-08-31 14:04:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'memory-controller-drv-6.16-2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl into soc/drivers

Browse Source 
Memory controller drivers for v6.16, part two

Few fixes for STM32 Octo Memory Manager driver introduced for the same
cycle in few commits before.  These fixes were reported only after wider
coverage by bots through linux-next exposure.

* tag 'memory-controller-drv-6.16-2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl:
  memory: stm32_omm: Fix error handling in stm32_omm_disable_child()
  memory: stm32_omm: Fix NULL vs IS_ERR() check in probe()
  memory: stm32_omm: Fix error handling in stm32_omm_configure()
  memory: stm32: Fix spelling mistake "resset" -> "reset"

Link: https://lore.kernel.org/r/20250516082415.7871-2-krzysztof.kozlowski@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2025-05-21 23:13:49 +02:00
parent 7148b42e85 388d0cc33c
commit a65dc234cd
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/memory/stm32_omm.c
View File

@@ -164,7 +164,7 @@ static int stm32_omm_disable_child(struct device *dev)
u8 i;
ret = stm32_omm_toggle_child_clock(dev, true);
if (!ret)
if (ret)
return ret;
for (i = 0; i < omm->nb_child; i++) {
@@ -173,7 +173,7 @@ static int stm32_omm_disable_child(struct device *dev)
ret = reset_control_acquire(reset);
if (ret) {
stm32_omm_toggle_child_clock(dev, false);
dev_err(dev, "Can not acquire resset %d\n", ret);
dev_err(dev, "Can not acquire reset %d\n", ret);
return ret;
}
@@ -222,6 +222,7 @@ static int stm32_omm_configure(struct device *dev)
clk_rate = clk_get_rate(omm->clk_bulk[i].clk);
if (!clk_rate) {
dev_err(dev, "Invalid clock rate\n");
ret = -EINVAL;
goto error;
}
@@ -230,8 +231,10 @@ static int stm32_omm_configure(struct device *dev)
}
rstc = devm_reset_control_get_exclusive(dev, "omm");
if (IS_ERR(rstc))
return dev_err_probe(dev, PTR_ERR(rstc), "reset get failed\n");
if (IS_ERR(rstc)) {
ret = dev_err_probe(dev, PTR_ERR(rstc), "reset get failed\n");
goto error;
}
reset_control_assert(rstc);
udelay(2);
@@ -317,8 +320,8 @@ static int stm32_omm_probe(struct platform_device *pdev)
return PTR_ERR(omm->io_base);
omm->mm_res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "memory_map");
if (IS_ERR(omm->mm_res))
return PTR_ERR(omm->mm_res);
if (!omm->mm_res)
return -ENODEV;
/* check child's access */
for_each_child_of_node_scoped(dev->of_node, child) {