Skip to content

Commit

Permalink
Merge tag 'arm-soc/for-5.17/drivers' of https://github.com/Broadcom/s…
Browse files Browse the repository at this point in the history
…tblinux 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 <[email protected]>
  • Loading branch information
arndb committed Dec 22, 2021
2 parents e9aff54 + f5029f6 commit 862d7e5
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion drivers/soc/bcm/brcmstb/pm/pm-mips.c
Original file line number Diff line number Diff line change
Expand Up @@ -405,11 +405,14 @@ static int brcmstb_pm_init(void)
i = ctrl.num_memc;
if (i >= MAX_NUM_MEMC) {
pr_warn("Too many MEMCs (max %d)\n", MAX_NUM_MEMC);
of_node_put(dn);
break;
}
base = brcmstb_ioremap_node(dn, 0);
if (IS_ERR(base))
if (IS_ERR(base)) {
of_node_put(dn);
goto ddr_err;
}

ctrl.memcs[i].ddr_phy_base = base;
ctrl.num_memc++;
Expand Down

0 comments on commit 862d7e5

Please sign in to comment.