diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-12-22 17:14:59 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-12-22 17:17:59 +0100 |
| commit | 862d7e5434154109c644cf2d28e3b94ab436263c (patch) | |
| tree | 7984543624389626d2e1a5a453fca79795ef0c5d | |
| parent | e9aff54425f062f2e8758d77e406df4ded00bd85 (diff) | |
| parent | f5029f62d9ba9b99fd712514784f91f920a63d21 (diff) | |
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>
| -rw-r--r-- | drivers/soc/bcm/brcmstb/pm/pm-mips.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/soc/bcm/brcmstb/pm/pm-mips.c b/drivers/soc/bcm/brcmstb/pm/pm-mips.c index cdc3e387f049..4dfb5a85032b 100644 --- a/drivers/soc/bcm/brcmstb/pm/pm-mips.c +++ b/drivers/soc/bcm/brcmstb/pm/pm-mips.c @@ -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++; |