aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Elder <elder@linaro.org>2021-02-03 19:06:55 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-02-17 11:02:26 +0100
commit23b2eac8b76a13acec6d6e38d9f87bcaeda55a78 (patch)
tree5968e27c20f42e647cb4dfd268edba0fc4c6e01b
parenta4595395a91571157e9253581a2d70a9171b7df3 (diff)
downloadkernel_replicant_linux-23b2eac8b76a13acec6d6e38d9f87bcaeda55a78.tar.gz
kernel_replicant_linux-23b2eac8b76a13acec6d6e38d9f87bcaeda55a78.tar.bz2
kernel_replicant_linux-23b2eac8b76a13acec6d6e38d9f87bcaeda55a78.zip
net: ipa: set error code in gsi_channel_setup()
[ Upstream commit 1d23a56b0296d29e7047b41fe0a42a001036160d ] In gsi_channel_setup(), we check to see if the configuration data contains any information about channels that are not supported by the hardware. If one is found, we abort the setup process, but the error code (ret) is not set in this case. Fix this bug. Fixes: 650d1603825d8 ("soc: qcom: ipa: the generic software interface") Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Alex Elder <elder@linaro.org> Link: https://lore.kernel.org/r/20210204010655.15619-1-elder@linaro.org Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/net/ipa/gsi.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ipa/gsi.c b/drivers/net/ipa/gsi.c
index 4a68da7115d1..2a65efd3e8da 100644
--- a/drivers/net/ipa/gsi.c
+++ b/drivers/net/ipa/gsi.c
@@ -1573,6 +1573,7 @@ static int gsi_channel_setup(struct gsi *gsi, bool legacy)
if (!channel->gsi)
continue; /* Ignore uninitialized channels */
+ ret = -EINVAL;
dev_err(gsi->dev, "channel %u not supported by hardware\n",
channel_id - 1);
channel_id = gsi->channel_count;