Commit aacb0a6d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pmdomain-v6.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm 

Pull pmdomain fixes from Ulf Hansson:

 - mediatek: Fix spinlock recursion fix during probe

 - imx: Fix reference count leak during probe

* tag 'pmdomain-v6.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm:
  pmdomain: imx: Fix reference count leak in imx_gpc_probe()
  pmdomain: mtk-pm-domains: Fix spinlock recursion fix in probe
parents 805f9a06 73cb5f6e

drivers/pmdomain/imx/gpc.c

+2 −3
Original line number Diff line number Diff line
@@ -402,13 +402,12 @@ static int imx_gpc_old_dt_init(struct device *dev, struct regmap *regmap, 
static int imx_gpc_probe(struct platform_device *pdev)

{

	const struct imx_gpc_dt_data *of_id_data = device_get_match_data(&pdev->dev);

	struct device_node *pgc_node;

	struct device_node *pgc_node __free(device_node)

		= of_get_child_by_name(pdev->dev.of_node, "pgc");

	struct regmap *regmap;

	void __iomem *base;

	int ret;



	pgc_node = of_get_child_by_name(pdev->dev.of_node, "pgc");



	/* bail out if DT too old and doesn't provide the necessary info */

	if (!of_property_present(pdev->dev.of_node, "#power-domain-cells") &&

	    !pgc_node)

drivers/pmdomain/mediatek/mtk-pm-domains.c

+6 −15
Original line number Diff line number Diff line
@@ -984,18 +984,6 @@ static void scpsys_domain_cleanup(struct scpsys *scpsys) 
	}

}



static struct device_node *scpsys_get_legacy_regmap(struct device_node *np, const char *pn)

{

	struct device_node *local_node;



	for_each_child_of_node(np, local_node) {

		if (of_property_present(local_node, pn))

			return local_node;

	}



	return NULL;

}



static int scpsys_get_bus_protection_legacy(struct device *dev, struct scpsys *scpsys)

{

	const u8 bp_blocks[3] = {
@@ -1017,7 +1005,8 @@ static int scpsys_get_bus_protection_legacy(struct device *dev, struct scpsys *s 
	 * this makes it then possible to allocate the array of bus_prot

	 * regmaps and convert all to the new style handling.

	 */

	node = scpsys_get_legacy_regmap(np, "mediatek,infracfg");

	of_node_get(np);

	node = of_find_node_with_property(np, "mediatek,infracfg");

	if (node) {

		regmap[0] = syscon_regmap_lookup_by_phandle(node, "mediatek,infracfg");

		of_node_put(node);
@@ -1030,7 +1019,8 @@ static int scpsys_get_bus_protection_legacy(struct device *dev, struct scpsys *s 
		regmap[0] = NULL;

	}



	node = scpsys_get_legacy_regmap(np, "mediatek,smi");

	of_node_get(np);

	node = of_find_node_with_property(np, "mediatek,smi");

	if (node) {

		smi_np = of_parse_phandle(node, "mediatek,smi", 0);

		of_node_put(node);
@@ -1048,7 +1038,8 @@ static int scpsys_get_bus_protection_legacy(struct device *dev, struct scpsys *s 
		regmap[1] = NULL;

	}



	node = scpsys_get_legacy_regmap(np, "mediatek,infracfg-nao");

	of_node_get(np);

	node = of_find_node_with_property(np, "mediatek,infracfg-nao");

	if (node) {

		regmap[2] = syscon_regmap_lookup_by_phandle(node, "mediatek,infracfg-nao");

		num_regmaps++;