Unverified Commit 9f8f0d07 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-drivers-for-v6.4-tag2' of... 

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/cover.1681113115.git.geert+renesas@glider.be


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents e15a7092 fc187a46

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -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 <linux@armlinux.org.uk>


































drivers/soc/renesas/renesas-soc.c



+4
−1






























Original line number
Diff line number
Diff line







@@ -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);