]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ssb: Fix error return code in ssb_bus_scan()
authorZhen Lei <thunder.leizhen@huawei.com>
Sat, 15 May 2021 07:29:49 +0000 (15:29 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Jul 2021 14:15:50 +0000 (16:15 +0200)
[ Upstream commit 77a0989baa427dbd242c5784d05a53ca3d197d43 ]

Fix to return -EINVAL from the error handling case instead of 0, as done
elsewhere in this function.

Fixes: 61e115a56d1a ("[SSB]: add Sonics Silicon Backplane bus support")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Acked-by: Michael Büsch <m@bues.ch>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210515072949.7151-1-thunder.leizhen@huawei.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/ssb/scan.c

index 6ceee98ed6ff2df6fad51458c765bbd76ab51918..5c7e61cafd195e2cebe4091d28d63b6d9570e8a5 100644 (file)
@@ -325,6 +325,7 @@ int ssb_bus_scan(struct ssb_bus *bus,
        if (bus->nr_devices > ARRAY_SIZE(bus->devices)) {
                pr_err("More than %d ssb cores found (%d)\n",
                       SSB_MAX_NR_CORES, bus->nr_devices);
+               err = -EINVAL;
                goto err_unmap;
        }
        if (bus->bustype == SSB_BUSTYPE_SSB) {