Skip to content

Commit 862d7e5

Browse files
committed
Merge tag 'arm-soc/for-5.17/drivers' of https://github.com/Broadcom/stblinux into arm/dt
This pull request contains Broadcom SoCs drivers changes for v5.17, please pull the following changes: - Wan adds a missing of_node_put() in the power management driver for MIPS SoCs. * tag 'arm-soc/for-5.17/drivers' of https://github.com/Broadcom/stblinux: soc: bcm: brcmstb: Add of_node_put() in pm-mips Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents e9aff54 + f5029f6 commit 862d7e5

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

drivers/soc/bcm/brcmstb/pm/pm-mips.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,11 +405,14 @@ static int brcmstb_pm_init(void)
405405
i = ctrl.num_memc;
406406
if (i >= MAX_NUM_MEMC) {
407407
pr_warn("Too many MEMCs (max %d)\n", MAX_NUM_MEMC);
408+
of_node_put(dn);
408409
break;
409410
}
410411
base = brcmstb_ioremap_node(dn, 0);
411-
if (IS_ERR(base))
412+
if (IS_ERR(base)) {
413+
of_node_put(dn);
412414
goto ddr_err;
415+
}
413416

414417
ctrl.memcs[i].ddr_phy_base = base;
415418
ctrl.num_memc++;

0 commit comments

Comments
 (0)