mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-06 08:46:46 +00:00
Code Issues Releases Wiki Activity

greybus: Remove apbridgea_shutdown_xx sequence if already done

Browse source 
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>
This commit is contained in:
Vaibhav Agarwal 2016-06-09 09:30:40 +05:30 committed by Greg Kroah-Hartman
parent 27c243cf5f
commit f2b6303d45
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/staging/greybus/audio_codec.c
View file

@ -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) {