Skip to content

Commit e6b7c8c

Browse files
committed
Merge tag 'pmdomain-v6.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm
Pull pmdomain fixes from Ulf Hansson: - Silence warning by adding a dummy release function - imx: Fix an OF node reference leak in imx_gpcv2_probe() * tag 'pmdomain-v6.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm: pmdomain: core: add dummy release function to genpd device pmdomain: imx: gpcv2: fix an OF node reference leak in imx_gpcv2_probe()
2 parents 8c2d370 + f64f610 commit e6b7c8c

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

drivers/pmdomain/core.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2142,6 +2142,11 @@ static int genpd_set_default_power_state(struct generic_pm_domain *genpd)
21422142
return 0;
21432143
}
21442144

2145+
static void genpd_provider_release(struct device *dev)
2146+
{
2147+
/* nothing to be done here */
2148+
}
2149+
21452150
static int genpd_alloc_data(struct generic_pm_domain *genpd)
21462151
{
21472152
struct genpd_governor_data *gd = NULL;
@@ -2173,6 +2178,7 @@ static int genpd_alloc_data(struct generic_pm_domain *genpd)
21732178

21742179
genpd->gd = gd;
21752180
device_initialize(&genpd->dev);
2181+
genpd->dev.release = genpd_provider_release;
21762182

21772183
if (!genpd_is_dev_name_fw(genpd)) {
21782184
dev_set_name(&genpd->dev, "%s", genpd->name);

drivers/pmdomain/imx/gpcv2.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1458,12 +1458,12 @@ static int imx_gpcv2_probe(struct platform_device *pdev)
14581458
.max_register = SZ_4K,
14591459
};
14601460
struct device *dev = &pdev->dev;
1461-
struct device_node *pgc_np;
1461+
struct device_node *pgc_np __free(device_node) =
1462+
of_get_child_by_name(dev->of_node, "pgc");
14621463
struct regmap *regmap;
14631464
void __iomem *base;
14641465
int ret;
14651466

1466-
pgc_np = of_get_child_by_name(dev->of_node, "pgc");
14671467
if (!pgc_np) {
14681468
dev_err(dev, "No power domains specified in DT\n");
14691469
return -EINVAL;

0 commit comments

Comments
 (0)