MLK-13992: ASoC: fsl_rpmsg_i2s: add flush workqueue

some cmd is sent by workqueue, others are sent by call send message
function directly, for workqueue may have delay, so there is occasion
that cmd is not sent in order.
Add flush_workqueue before the CLOSE and SUSPEND to make sure previous
cmd is finished in that time.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>

diff --git a/sound/soc/fsl/fsl_rpmsg_i2s.c b/sound/soc/fsl/fsl_rpmsg_i2s.c
index 172c279..d8f8da8 100644 (file)
--- a/sound/soc/fsl/fsl_rpmsg_i2s.c
+++ b/sound/soc/fsl/fsl_rpmsg_i2s.c
@@ -196,6 +196,7 @@ static int fsl_rpmsg_i2s_suspend(struct device *dev)
        struct i2s_rpmsg_s *rpmsg_tx;
        struct i2s_rpmsg_s *rpmsg_rx;
 
+       flush_workqueue(i2s_info->rpmsg_wq);
        rpmsg_tx = &i2s_info->send_msg[SNDRV_PCM_STREAM_PLAYBACK];
        rpmsg_rx = &i2s_info->send_msg[SNDRV_PCM_STREAM_CAPTURE];
 

diff --git a/sound/soc/fsl/imx-pcm-rpmsg.c b/sound/soc/fsl/imx-pcm-rpmsg.c
index 25369cc..ace3bd7 100644 (file)
--- a/sound/soc/fsl/imx-pcm-rpmsg.c
+++ b/sound/soc/fsl/imx-pcm-rpmsg.c
@@ -149,6 +149,8 @@ static int imx_rpmsg_pcm_close(struct snd_pcm_substream *substream)
                rpmsg->header.cmd = I2S_TX_CLOSE;
        else
                rpmsg->header.cmd = I2S_RX_CLOSE;
+
+       flush_workqueue(i2s_info->rpmsg_wq);
        i2s_info->send_message(rpmsg, i2s_info);
 
        kfree(prtd);