summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAlex Elder <elder@linaro.org>2021-02-01 20:28:44 +0300
committerJakub Kicinski <kuba@kernel.org>2021-02-03 04:42:35 +0300
commit6b00a76a1db6e8898b5f09e0f09ed129ce870ce3 (patch)
treea2c1472b1e8df40404c2d349505c7e61819f04f3 /drivers
parent097b9146c0e26aabaa6ff3e5ea536a53f5254a79 (diff)
downloadlinux-6b00a76a1db6e8898b5f09e0f09ed129ce870ce3.tar.xz
net: ipa: don't thaw channel if error starting
If an error occurs starting a channel, don't "thaw" it. We should assume the channel remains in a non-started state. Update the comment in gsi_channel_stop(); calls to this function are no longer retried. Signed-off-by: Alex Elder <elder@linaro.org> Acked-by: Willem de Bruijn <willemb@google.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ipa/gsi.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ipa/gsi.c b/drivers/net/ipa/gsi.c
index 204fd8ba7728..1df7775a9bee 100644
--- a/drivers/net/ipa/gsi.c
+++ b/drivers/net/ipa/gsi.c
@@ -885,7 +885,9 @@ int gsi_channel_start(struct gsi *gsi, u32 channel_id)
mutex_unlock(&gsi->mutex);
- gsi_channel_thaw(channel);
+ /* Thaw the channel if successful */
+ if (!ret)
+ gsi_channel_thaw(channel);
return ret;
}
@@ -910,7 +912,7 @@ int gsi_channel_stop(struct gsi *gsi, u32 channel_id)
mutex_unlock(&gsi->mutex);
- /* Thaw the channel if we need to retry (or on error) */
+ /* Re-thaw the channel if an error occurred while stopping */
if (ret)
gsi_channel_thaw(channel);