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

Merge tag 'omap-for-v5.20/soc-signed' of... 

Merge tag 'omap-for-v5.20/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/soc

SoC changes omaps for v5.20 merge window

SoC changes omaps mostly for missing of_node_put() calls and cosmetic
Kconfig changes. These can be all merged when suitable, there is no urgent
need to merge this as fixes.

* tag 'omap-for-v5.20/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: Kconfig: Fix indentation
  ARM: OMAP2+: Fix refcount leak in omap3xxx_prm_late_init
  ARM: OMAP2+: pdata-quirks: Fix refcount leak bug
  ARM: OMAP2+: display: Fix refcount leak bug
  ARM: OMAP2+: Fix refcount leak in omapdss_init_of

Link: https://lore.kernel.org/r/pull-1656918583-2801@atomide.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 1c74a93c fe71f6e1

arch/arm/mach-omap2/display.c

+3 −0
Original line number Diff line number Diff line
@@ -211,6 +211,7 @@ static int __init omapdss_init_fbdev(void) 
	node = of_find_node_by_name(NULL, "omap4_padconf_global");

	if (node)

		omap4_dsi_mux_syscon = syscon_node_to_regmap(node);

	of_node_put(node);



	return 0;

}
@@ -259,11 +260,13 @@ static int __init omapdss_init_of(void) 


	if (!pdev) {

		pr_err("Unable to find DSS platform device\n");

		of_node_put(node);

		return -ENODEV;

	}



	r = of_platform_populate(node, NULL, NULL, &pdev->dev);

	put_device(&pdev->dev);

	of_node_put(node);

	if (r) {

		pr_err("Unable to populate DSS submodule devices\n");

		return r;

arch/arm/mach-omap2/pdata-quirks.c

+2 −0
Original line number Diff line number Diff line
@@ -540,6 +540,8 @@ pdata_quirks_init_clocks(const struct of_device_id *omap_dt_match_table) 


		of_platform_populate(np, omap_dt_match_table,

				     omap_auxdata_lookup, NULL);



		of_node_put(np);

	}

}

arch/arm/mach-omap2/prm3xxx.c

+1 −0
Original line number Diff line number Diff line
@@ -708,6 +708,7 @@ static int omap3xxx_prm_late_init(void) 
	}



	irq_num = of_irq_get(np, 0);

	of_node_put(np);

	if (irq_num == -EPROBE_DEFER)

		return irq_num;

arch/arm/mach-omap2/Kconfig

+3 −3

File changed.

Contains only whitespace changes.