diff options
| author | Ulf Hansson <ulfh@kernel.org> | 2026-07-27 11:49:03 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulfh@kernel.org> | 2026-07-27 11:49:03 +0200 |
| commit | 84a89ca15bb1f15a0779f30e1ef99075b35be69e (patch) | |
| tree | 3c75fbf88877db3e59f73a6e06a1ad1f2c01307f | |
| parent | 0fb3c98da0183f36aa047c26060280e1124a1336 (diff) | |
| parent | 3e013bc8b941bd52c8e3a99798d0ae8792cb71ca (diff) | |
| download | linux-next-84a89ca15bb1f15a0779f30e1ef99075b35be69e.tar.gz linux-next-84a89ca15bb1f15a0779f30e1ef99075b35be69e.zip | |
pmdomain: Merge branch fixes into next
Merge the pmdomain fixes for v7.2-rc[n] into the next branch, to allow
them to get tested together with the pmdomain changes that are targeted
for the next release.
Signed-off-by: Ulf Hansson <ulfh@kernel.org>
| -rw-r--r-- | drivers/pmdomain/mediatek/mtk-pm-domains.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/drivers/pmdomain/mediatek/mtk-pm-domains.c b/drivers/pmdomain/mediatek/mtk-pm-domains.c index 5eadc7271130..f0fa79e01f9c 100644 --- a/drivers/pmdomain/mediatek/mtk-pm-domains.c +++ b/drivers/pmdomain/mediatek/mtk-pm-domains.c @@ -1155,12 +1155,15 @@ static int scpsys_get_bus_protection_legacy(struct device *dev, struct scpsys *s 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); num_regmaps++; - if (IS_ERR(regmap[0])) - return dev_err_probe(dev, PTR_ERR(regmap[0]), + if (IS_ERR(regmap[0])) { + ret = dev_err_probe(dev, PTR_ERR(regmap[0]), "%pOF: failed to get infracfg regmap\n", node); + of_node_put(node); + return ret; + } + of_node_put(node); } else { regmap[0] = NULL; } @@ -1169,17 +1172,22 @@ static int scpsys_get_bus_protection_legacy(struct device *dev, struct scpsys *s node = of_find_node_with_property(np, "mediatek,smi"); if (node) { smi_np = of_parse_phandle(node, "mediatek,smi", 0); - of_node_put(node); - if (!smi_np) + if (!smi_np) { + of_node_put(node); return -ENODEV; + } regmap[1] = device_node_to_regmap(smi_np); num_regmaps++; of_node_put(smi_np); - if (IS_ERR(regmap[1])) - return dev_err_probe(dev, PTR_ERR(regmap[1]), + if (IS_ERR(regmap[1])) { + ret = dev_err_probe(dev, PTR_ERR(regmap[1]), "%pOF: failed to get SMI regmap\n", node); + of_node_put(node); + return ret; + } + of_node_put(node); } else { regmap[1] = NULL; } |