From: Vaibhav Agarwal <vaibhav.agarwal@linaro.org>
Date: Thu, 9 Jun 2016 04:00:40 +0000 (+0530)
Subject: greybus: Remove apbridgea_shutdown_xx sequence if already done
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f2b6303d4505b5b046691a936c346a0e376cd9f3;p=linux-beck.git

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