From: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Date: Fri, 1 Aug 2014 15:08:38 +0000 (+0800)
Subject: ASoC: Intel: Delete message when IPC timeout occurs
X-Git-Tag: v3.17-rc1~101^2~5^2~7^2~2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=97cfc751e1f2c300e093a9d2840aeee075db68d4;p=~emulex%2Finfiniband.git

ASoC: Intel: Delete message when IPC timeout occurs

This fixes a bug where we dont delete the current message when an
IPC message timeout occurs.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Jie Yang <yang.jie@intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
---

diff --git a/sound/soc/intel/sst-haswell-ipc.c b/sound/soc/intel/sst-haswell-ipc.c
index 9825d195b8c..1ca71a28376 100644
--- a/sound/soc/intel/sst-haswell-ipc.c
+++ b/sound/soc/intel/sst-haswell-ipc.c
@@ -502,6 +502,7 @@ static int tx_wait_done(struct sst_hsw *hsw, struct ipc_message *msg,
 		ipc_shim_dbg(hsw, "message timeout");
 
 		trace_ipc_error("error message timeout for", msg->header);
+		list_del(&msg->list);
 		ret = -ETIMEDOUT;
 	} else {