summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLu Wei <luwei32@huawei.com>2020-11-26 10:43:11 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-11-26 11:40:39 +0100
commit1308d25787b09e49b5e95ed8cf7d0ca331669f04 (patch)
tree368dc21883f4529a055555dc67d226025511ab02
parent82fb009a44cc012f2a05af7e0999f611f31091c4 (diff)
downloadlinux-rt-1308d25787b09e49b5e95ed8cf7d0ca331669f04.tar.gz
maple: fix wrong return value of maple_bus_init().
[ Upstream commit bde82ee391fa6d3ad054313c4aa7b726d32515ce ] If KMEM_CACHE or maple_alloc_dev failed, the maple_bus_init() will return 0 rather than error, because the retval is not changed after KMEM_CACHE or maple_alloc_dev failed. Fixes: 17be2d2b1c33 ("sh: Add maple bus support for the SEGA Dreamcast.") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Lu Wei <luwei32@huawei.com> Acked-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Signed-off-by: Rich Felker <dalias@libc.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/sh/maple/maple.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c
index bec81c2404f7..1682fa3671bc 100644
--- a/drivers/sh/maple/maple.c
+++ b/drivers/sh/maple/maple.c
@@ -835,8 +835,10 @@ static int __init maple_bus_init(void)
maple_queue_cache = KMEM_CACHE(maple_buffer, SLAB_HWCACHE_ALIGN);
- if (!maple_queue_cache)
+ if (!maple_queue_cache) {
+ retval = -ENOMEM;
goto cleanup_bothirqs;
+ }
INIT_LIST_HEAD(&maple_waitq);
INIT_LIST_HEAD(&maple_sentq);
@@ -849,6 +851,7 @@ static int __init maple_bus_init(void)
if (!mdev[i]) {
while (i-- > 0)
maple_free_dev(mdev[i]);
+ retval = -ENOMEM;
goto cleanup_cache;
}
baseunits[i] = mdev[i];