sieni
/
linux
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
 -----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCgAuFiEE3dJiKD0RGyM7briowTdm5oaLg9cFAmgm9fwQHGtyemtAa2Vy
 bmVsLm9yZwAKCRDBN2bmhouD14omD/40XUoNktd+HlB6fmNrchXHYJf78w5k58uT
 unsJBi/NLaa1niz8p62mASv714ed3UlNRnkuC7XfHrayK84Z8XH6TlZSQ2ZFzr6l
 77ouhBhTSjFVrTOYUk/fBJNEZvz1N0Js3Hg77WCYzW+im8KAgnd7j+pZd+0DpJSS
 ditchWONPwcKuFzMGVUzdkJ5KOgnokxcL+dftE7Js0Y/RWNX/NdSYc4dbDTbtFRL
 9rFn6Q8JdX7w15AKRyUAzW6jAzcWxyPfFkAPVs/xTKlb+4E5fYO3Xzxoax6hmvA3
 Y1m+eNqoDU6+JyyBvHcePcDosW4xWkq12HzTfSaN7+qGugK7i6Uycn5SNfYP5nbi
 iIjzT49F2vv6PUPt2YlpU0C8VU3QGgcaztcSkReWOJXH1xZO4tB4SvzS8zJp47cN
 aFD9ENFT8BitDrrYDN+3f6TMUCJ929GXs2cFiIlUzdwO7bh3yfvG2uUw0Lq6UOf2
 C9ZbRrVcOa7QhEp7aPHPQwpHMbCbtRswyDTUh8PejZK4BkibNaPAuExaIBJ2jlWA
 DiRFDB1hxiYX0oAdidHdaTO6BZu+CxRKYCGTXWs8RA43YhDJlE4JPI4QzhDK9PfC
 csJ/kKf/sWdychxuXtlDW4UKJ60QRN5Hhv4Yeclxl4ctrZRrNglr7gCV+Bdqn+FI
 3zAuuDHb+w==
 =pzD0
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmguQg4ACgkQmmx57+YA
 GNkR9Q//aXb5IGGM0LMrN3NG20eyOo9ONylYPfXLs8I3IVFXfxVc1zGVMkCXXZdF
 4tySwlSQxIJ1cpzDqavcga/BoVtZgMd6VhsuZvd+gSGu6UprtwUEXM+ZrIwKKRwJ
 XV4MxaKqDoJTWza5y9uSjJrnoek0Mz+WNQ6wycRvriGCdOMgaD+lyrCYFgqzfLDu
 ddKiuwQOqq1o7A4+C7bhzF2SFStgvBlS464ZCTY7RLnklfQWf+LwxxqQu+gQgJ2z
 TNZS7TSkkqKBzKdfFpPiy139xAfmYDO0mB6OXb7299K7tFJsK2iuczvHemiTF66N
 ZQR5/Q95MgUhC66Eu5Z+bfar6YMLA00jFrIdOJCB9BlC8rWd43fTh5atL4+mwiNx
 4nwXi7W+AtE8ITM+IiRiyRN903T11w4CWiM9FtmuwSyr8ATJ4g+QQQ1YCvRhebfD
 9WOXVzbUZtEAnDLmjws+BBptKdC+cfw5tMIphfmfI0mxCFfIfnSWwQuHYj6CiXQV
 MQXFDMLe+WTbr/T15bMvuyxhxSNgUTW9Hku479/THMR9/4G6HmtetFbh9AUarbJI
 98fdS8o//iTc25c7xFCPdol12V1PfYp0DaSGDBqlH5AQaIK5+uDoh/kHLstB09Kb
 XjCX3Cr2YzUehumtfz/5tltSMtkjq7NvUdjq9nANFW+KZpNQ568=
 =q9DF
 -----END PGP SIGNATURE-----

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

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
Show Stats 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) {