Merge tag 'hsi-for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi

[linux-2.6-block.git] / drivers / hsi / clients / ssi_protocol.c

diff --git a/drivers/hsi/clients/ssi_protocol.c b/drivers/hsi/clients/ssi_protocol.c
index 0253e76f1df27bb5cbe7ff68b8f62117436a641d..365b5d5967accf1d69d79bb8dc3c685d827b7725 100644 (file)
--- a/drivers/hsi/clients/ssi_protocol.c
+++ b/drivers/hsi/clients/ssi_protocol.c
@@ -291,7 +291,7 @@ static void ssip_set_rxstate(struct ssi_protocol *ssi, unsigned int state)
                /* CMT speech workaround */
                if (atomic_read(&ssi->tx_usecnt))
                        break;
-               /* Otherwise fall through */
+               /* Else, fall through */
        case RECEIVING:
                mod_timer(&ssi->keep_alive, jiffies +
                                                msecs_to_jiffies(SSIP_KATOUT));
@@ -466,9 +466,10 @@ static void ssip_keep_alive(struct timer_list *t)
                case SEND_READY:
                        if (atomic_read(&ssi->tx_usecnt) == 0)
                                break;
+                       /* Fall through */
                        /*
-                        * Fall through. Workaround for cmt-speech
-                        * in that case we relay on audio timers.
+                        * Workaround for cmt-speech in that case
+                        * we relay on audio timers.
                         */
                case SEND_IDLE:
                        spin_unlock(&ssi->lock);