diff options
| author | Mark Brown <broonie@kernel.org> | 2019-05-30 16:47:43 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-05-30 16:47:43 +0100 |
| commit | 79b3b7c4a396b9fa1963ac70e853998633e8151d (patch) | |
| tree | c1e507b4a6fff773ec81e90e1be11f1b35e773b6 /sound/soc/sof/pcm.c | |
| parent | e13ef82a9ab83dd21d8dd43ef9f5e8bf5b101106 (diff) | |
| parent | 1f2675f6655838aaf910f911fd0abc821e3ff3df (diff) | |
Merge branch 'asoc-5.2' into asoc-5.3
Diffstat (limited to 'sound/soc/sof/pcm.c')
| -rw-r--r-- | sound/soc/sof/pcm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/sof/pcm.c b/sound/soc/sof/pcm.c index 4f536c0de0a5..6dc5f97be0bc 100644 --- a/sound/soc/sof/pcm.c +++ b/sound/soc/sof/pcm.c @@ -211,8 +211,8 @@ static int sof_pcm_hw_params(struct snd_pcm_substream *substream, /* save pcm hw_params */ memcpy(&spcm->params[substream->stream], params, sizeof(*params)); - INIT_WORK(&spcm->stream[substream->stream].period_elapsed_work, - sof_pcm_period_elapsed_work); + /* clear hw_params_upon_resume flag */ + spcm->hw_params_upon_resume[substream->stream] = 0; return ret; } @@ -428,8 +428,8 @@ static int sof_pcm_open(struct snd_pcm_substream *substream) dev_dbg(sdev->dev, "pcm: open stream %d dir %d\n", spcm->pcm.pcm_id, substream->stream); - /* clear hw_params_upon_resume flag */ - spcm->hw_params_upon_resume[substream->stream] = 0; + INIT_WORK(&spcm->stream[substream->stream].period_elapsed_work, + sof_pcm_period_elapsed_work); caps = &spcm->pcm.caps[substream->stream]; |