diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2019-04-07 23:19:07 +0200 |
|---|---|---|
| committer | Florian Fainelli <f.fainelli@gmail.com> | 2019-05-20 18:27:50 +0200 |
| commit | 490cad5a3ad6ef0bfd3168a5063140b982f3b22a (patch) | |
| tree | 8b041f7eba812b51f84bd0a251e934e3c92e5058 /drivers/soc | |
| parent | Linux 5.2-rc1 (diff) | |
| download | linux-490cad5a3ad6ef0bfd3168a5063140b982f3b22a.tar.xz linux-490cad5a3ad6ef0bfd3168a5063140b982f3b22a.zip | |
soc: brcmstb: Fix error path for unsupported CPUs
In case setup_hifcpubiuctrl_regs() returns an error, because of e.g:
an unsupported CPU type, just catch that error and return instead of
blindly continuing with the initialization. This fixes a NULL pointer
de-reference with the code continuing without having a proper array of
registers to use.
Fixes: 22f7a9116eba ("soc: brcmstb: Correct CPU_CREDIT_REG offset for Brahma-B53 CPUs")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/bcm/brcmstb/biuctrl.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/soc/bcm/brcmstb/biuctrl.c b/drivers/soc/bcm/brcmstb/biuctrl.c index 6d89ebf13b8a..c16273b31b94 100644 --- a/drivers/soc/bcm/brcmstb/biuctrl.c +++ b/drivers/soc/bcm/brcmstb/biuctrl.c @@ -246,7 +246,9 @@ static int __init brcmstb_biuctrl_init(void) if (!np) return 0; - setup_hifcpubiuctrl_regs(np); + ret = setup_hifcpubiuctrl_regs(np); + if (ret) + return ret; ret = mcp_write_pairing_set(); if (ret) { |