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>

diff --git a/drivers/net/ipa/gsi.c b/drivers/net/ipa/gsi.c
index 204fd8ba77285a5c7bb1bacea6e03fdb498358a7..1df7775a9bee31c81b0f7b0a045cbe83b3611993 100644 (file)
--- 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);