diff options
| author | Arnd Bergmann <[email protected]> | 2023-04-14 14:32:54 +0200 |
|---|---|---|
| committer | Arnd Bergmann <[email protected]> | 2023-04-14 14:32:55 +0200 |
| commit | 9f8f0d07249bb738d78e58c9554d0907f963b60d (patch) | |
| tree | d906c83ebda5f5d41c991f551cc88575b68f015a | |
| parent | e15a70922f6adee60fbcc8ee866e44ec573790d0 (diff) | |
| parent | fc187a46a8e682f0f1167b230792b88de01ceaa0 (diff) | |
Merge tag 'renesas-drivers-for-v6.4-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into soc/drivers
Renesas driver updates for v6.4 (take two)
- Add "renesas," file contents pattern to MAINTAINERS,
- Fix a small leak on OOM.
* tag 'renesas-drivers-for-v6.4-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
soc: renesas: renesas-soc: Release 'chipid' from ioremap()
MAINTAINERS: renesas: Add "renesas," file contents pattern
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnd Bergmann <[email protected]>
| -rw-r--r-- | MAINTAINERS | 1 | ||||
| -rw-r--r-- | drivers/soc/renesas/renesas-soc.c | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ec57c42ed544..12bdd7aaec44 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2654,6 +2654,7 @@ F: arch/arm64/boot/dts/renesas/ F: arch/riscv/boot/dts/renesas/ F: drivers/soc/renesas/ F: include/linux/soc/renesas/ +K: \brenesas, ARM/RISCPC ARCHITECTURE M: Russell King <[email protected]> diff --git a/drivers/soc/renesas/renesas-soc.c b/drivers/soc/renesas/renesas-soc.c index 4ba893e45427..42af7c09f743 100644 --- a/drivers/soc/renesas/renesas-soc.c +++ b/drivers/soc/renesas/renesas-soc.c @@ -469,8 +469,11 @@ static int __init renesas_soc_init(void) } soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL); - if (!soc_dev_attr) + if (!soc_dev_attr) { + if (chipid) + iounmap(chipid); return -ENOMEM; + } np = of_find_node_by_path("/"); of_property_read_string(np, "model", &soc_dev_attr->machine); |