Unverified Commit aa61fa3e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-drivers-for-v5.20' of... 

Merge tag 'amlogic-drivers-for-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into arm/drivers

Amlogic Drivers changes for v5.20:
- Fix refcount leak in meson-secure-pwrc.c
- Fix refcount leak in meson_mx_socinfo_init

* tag 'amlogic-drivers-for-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  soc: amlogic: Fix refcount leak in meson-secure-pwrc.c
  meson-mx-socinfo: Fix refcount leak in meson_mx_socinfo_init

Link: https://lore.kernel.org/r/0c01e173-9abf-69ac-7882-e6ecc3935c33@baylibre.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 92a1691b d18529a4

drivers/soc/amlogic/meson-mx-socinfo.c

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ static int __init meson_mx_socinfo_init(void) 
	np = of_find_matching_node(NULL, meson_mx_socinfo_analog_top_ids);

	if (np) {

		analog_top_regmap = syscon_node_to_regmap(np);

		of_node_put(np);

		if (IS_ERR(analog_top_regmap))

			return PTR_ERR(analog_top_regmap);

drivers/soc/amlogic/meson-secure-pwrc.c

+3 −1
Original line number Diff line number Diff line
@@ -152,8 +152,10 @@ static int meson_secure_pwrc_probe(struct platform_device *pdev) 
	}



	pwrc = devm_kzalloc(&pdev->dev, sizeof(*pwrc), GFP_KERNEL);

	if (!pwrc)

	if (!pwrc) {

		of_node_put(sm_np);

		return -ENOMEM;

	}



	pwrc->fw = meson_sm_get(sm_np);

	of_node_put(sm_np);