diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-06-12 08:44:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-06-12 08:44:56 -0700 |
| commit | fd41dc46db5eecf21c9d53fe034a731a2767030a (patch) | |
| tree | 7feafea0af1648abcbcd8844d5b5ed483be107c4 /drivers/soc | |
| parent | f51cae6603c05b4b1fac65c773592e5bc8037251 (diff) | |
| parent | 9c648f3554920721d8878807cd794fe2d7f989e8 (diff) | |
Merge tag 'soc-fixes-7.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull SoC fixes from Arnd Bergmann:
"Two more small fixes came in, both addressing corner cases in platform
specific code: the microchip mpfs system controller probe and the CPU
power management on 32-bit rockchips SoCs"
* tag 'soc-fixes-7.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
ARM: rockchip: keep reset control around
soc: microchip: mpfs-sys-controller: fix resource leak on probe error
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/microchip/mpfs-sys-controller.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/soc/microchip/mpfs-sys-controller.c b/drivers/soc/microchip/mpfs-sys-controller.c index 92d1142a59e6..0400a01b2338 100644 --- a/drivers/soc/microchip/mpfs-sys-controller.c +++ b/drivers/soc/microchip/mpfs-sys-controller.c @@ -158,8 +158,8 @@ no_flash: of_data = (struct mpfs_syscon_config *) device_get_match_data(dev); if (!of_data) { - dev_err(dev, "Error getting match data\n"); - return -EINVAL; + ret = dev_err_probe(dev, -EINVAL, "Error getting match data\n"); + goto out_free_channel; } for (i = 0; i < of_data->nb_subdevs; i++) { @@ -173,6 +173,8 @@ no_flash: return 0; +out_free_channel: + mbox_free_channel(sys_controller->chan); out_free: kfree(sys_controller); return ret; |