greybus: Remove apbridgea_shutdown_xx sequence if already done

While reordering gb_deactivate sequence to avoid protocol error this was
mistakenly added even during shutdown_tx/rx. It is supposed to be done
immediately after stop_tx and only once.

Fixes: 739f25d5f490 ("audio: Reorder gb_deactivate sequence to avoid protocol error")
Signed-off-by: Vaibhav Agarwal <vaibhav.agarwal@linaro.org>
Reviewed-by: Mark Greer <mgreer@animalcreek.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

diff --git a/drivers/staging/greybus/audio_codec.c b/drivers/staging/greybus/audio_codec.c
index 3344693..2feac6b 100644 (file)
--- a/drivers/staging/greybus/audio_codec.c
+++ b/drivers/staging/greybus/audio_codec.c
@@ -396,12 +396,6 @@ static int gbmodule_shutdown_tx(struct gbaudio_module_info *module,
                return 0;
        }
 
-       if (codec_state == GBAUDIO_CODEC_STOP) {
-               ret = gb_audio_apbridgea_shutdown_tx(data->connection, 0);
-               if (ret)
-                       return ret;
-       }
-
        /* deactivate */
        cportid = data->connection->intf_cport_id;
        if (module_state >= GBAUDIO_CODEC_PREPARE) {
@@ -435,12 +429,6 @@ static int gbmodule_shutdown_rx(struct gbaudio_module_info *module,
                return 0;
        }
 
-       if (codec_state == GBAUDIO_CODEC_STOP) {
-               ret = gb_audio_apbridgea_shutdown_rx(data->connection, 0);
-               if (ret)
-                       return ret;
-       }
-
        /* deactivate */
        cportid = data->connection->intf_cport_id;
        if (module_state >= GBAUDIO_CODEC_PREPARE) {