Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+8
-18
+2
-3
drivers/pmdomain/imx/gpc.c
+2
-3
drivers/pmdomain/imx/gpc.c
···
402
402
static int imx_gpc_probe(struct platform_device *pdev)
403
403
{
404
404
const struct imx_gpc_dt_data *of_id_data = device_get_match_data(&pdev->dev);
405
-
struct device_node *pgc_node;
405
+
struct device_node *pgc_node __free(device_node)
406
+
= of_get_child_by_name(pdev->dev.of_node, "pgc");
406
407
struct regmap *regmap;
407
408
void __iomem *base;
408
409
int ret;
409
-
410
-
pgc_node = of_get_child_by_name(pdev->dev.of_node, "pgc");
411
410
412
411
/* bail out if DT too old and doesn't provide the necessary info */
413
412
if (!of_property_present(pdev->dev.of_node, "#power-domain-cells") &&
+6
-15
drivers/pmdomain/mediatek/mtk-pm-domains.c
+6
-15
drivers/pmdomain/mediatek/mtk-pm-domains.c
···
984
984
}
985
985
}
986
986
987
-
static struct device_node *scpsys_get_legacy_regmap(struct device_node *np, const char *pn)
988
-
{
989
-
struct device_node *local_node;
990
-
991
-
for_each_child_of_node(np, local_node) {
992
-
if (of_property_present(local_node, pn))
993
-
return local_node;
994
-
}
995
-
996
-
return NULL;
997
-
}
998
-
999
987
static int scpsys_get_bus_protection_legacy(struct device *dev, struct scpsys *scpsys)
1000
988
{
1001
989
const u8 bp_blocks[3] = {
···
1005
1017
* this makes it then possible to allocate the array of bus_prot
1006
1018
* regmaps and convert all to the new style handling.
1007
1019
*/
1008
-
node = scpsys_get_legacy_regmap(np, "mediatek,infracfg");
1020
+
of_node_get(np);
1021
+
node = of_find_node_with_property(np, "mediatek,infracfg");
1009
1022
if (node) {
1010
1023
regmap[0] = syscon_regmap_lookup_by_phandle(node, "mediatek,infracfg");
1011
1024
of_node_put(node);
···
1019
1030
regmap[0] = NULL;
1020
1031
}
1021
1032
1022
-
node = scpsys_get_legacy_regmap(np, "mediatek,smi");
1033
+
of_node_get(np);
1034
+
node = of_find_node_with_property(np, "mediatek,smi");
1023
1035
if (node) {
1024
1036
smi_np = of_parse_phandle(node, "mediatek,smi", 0);
1025
1037
of_node_put(node);
···
1038
1048
regmap[1] = NULL;
1039
1049
}
1040
1050
1041
-
node = scpsys_get_legacy_regmap(np, "mediatek,infracfg-nao");
1051
+
of_node_get(np);
1052
+
node = of_find_node_with_property(np, "mediatek,infracfg-nao");
1042
1053
if (node) {
1043
1054
regmap[2] = syscon_regmap_lookup_by_phandle(node, "mediatek,infracfg-nao");
1044
1055
num_regmaps++;