Skip to content

Commit 094041b

Browse files
committed
pmdomain: Merge branch fixes into next
Merge the pmdomain fixes for v6.13-rc[n] into the next branch, to allow them to get tested together with the new changes that are targeted for v6.14. Signed-off-by: Ulf Hansson <[email protected]>
2 parents b06bc47 + f64f610 commit 094041b

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
@@ -1459,12 +1459,12 @@ static int imx_gpcv2_probe(struct platform_device *pdev)
14591459
.max_register = SZ_4K,
14601460
};
14611461
struct device *dev = &pdev->dev;
1462-
struct device_node *pgc_np;
1462+
struct device_node *pgc_np __free(device_node) =
1463+
of_get_child_by_name(dev->of_node, "pgc");
14631464
struct regmap *regmap;
14641465
void __iomem *base;
14651466
int ret;
14661467

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

0 commit comments

Comments
 (0)