Skip to content

Commit 9f8f0d0

Browse files
committed
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]>
2 parents e15a709 + fc187a4 commit 9f8f0d0

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2654,6 +2654,7 @@ F: arch/arm64/boot/dts/renesas/
26542654
F: arch/riscv/boot/dts/renesas/
26552655
F: drivers/soc/renesas/
26562656
F: include/linux/soc/renesas/
2657+
K: \brenesas,
26572658

26582659
ARM/RISCPC ARCHITECTURE
26592660
M: Russell King <[email protected]>

drivers/soc/renesas/renesas-soc.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,8 +469,11 @@ static int __init renesas_soc_init(void)
469469
}
470470

471471
soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL);
472-
if (!soc_dev_attr)
472+
if (!soc_dev_attr) {
473+
if (chipid)
474+
iounmap(chipid);
473475
return -ENOMEM;
476+
}
474477

475478
np = of_find_node_by_path("/");
476479
of_property_read_string(np, "model", &soc_dev_attr->machine);

0 commit comments

Comments
 (0)