diff options
| author | Jeeja KP <jeeja.kp@intel.com> | 2017-01-10 17:57:46 +0530 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-01-19 15:43:03 +0000 |
| commit | 7cbfdf87f422211b9a1f2845acb2e39597b3ef7e (patch) | |
| tree | 9b4cf76a8133207c748135a14251b19ab1ace64e /sound/soc/intel | |
| parent | 3122c66fd2159f4ab210da8d95465af2f145fad7 (diff) | |
| download | op-kernel-dev-7cbfdf87f422211b9a1f2845acb2e39597b3ef7e.zip op-kernel-dev-7cbfdf87f422211b9a1f2845acb2e39597b3ef7e.tar.gz | |
ASoC: Intel: Skylake: Don't reset pass-through pipe in BE prepare
When pipe is pass-through, BE and FE modules are defined inside
a pipe, reset of pipe will be done in FE DAI prepare. So don't
reset in the BE prepare.
Signed-off-by: Jeeja KP <jeeja.kp@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel')
| -rw-r--r-- | sound/soc/intel/skylake/skl-pcm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c index 10fa10d..aefcfca 100644 --- a/sound/soc/intel/skylake/skl-pcm.c +++ b/sound/soc/intel/skylake/skl-pcm.c @@ -572,8 +572,8 @@ static int skl_link_pcm_prepare(struct snd_pcm_substream *substream, /* In case of XRUN recovery, reset the FW pipe to clean state */ mconfig = skl_tplg_be_get_cpr_module(dai, substream->stream); - if (mconfig && (substream->runtime->status->state == - SNDRV_PCM_STATE_XRUN)) + if (mconfig && !mconfig->pipe->passthru && + (substream->runtime->status->state == SNDRV_PCM_STATE_XRUN)) skl_reset_pipe(skl->skl_sst, mconfig->pipe); return 0; |
