diff options
| author | Vaibhav Agarwal <vaibhav.agarwal@linaro.org> | 2016-06-09 09:30:40 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2016-06-09 21:21:09 -0700 |
| commit | f2b6303d4505b5b046691a936c346a0e376cd9f3 (patch) | |
| tree | ba65eaa2fa1047e6ad07a5768c062792ad9fc333 /drivers/staging/greybus/audio_codec.c | |
| parent | 27c243cf5fcf4b3bb525f1f3f15ed8db91199507 (diff) | |
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>
Diffstat (limited to 'drivers/staging/greybus/audio_codec.c')
| -rw-r--r-- | drivers/staging/greybus/audio_codec.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/staging/greybus/audio_codec.c b/drivers/staging/greybus/audio_codec.c index 334469345f87..2feac6beea57 100644 --- 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) { |