Skip to content

Commit ca3abbe

Browse files
committed
Revert "ASoC: SOF: Intel: hda-dai: configure SSP in prepare stage"
This reverts commit 22a5460. This commit was just wrong, on an xrun we absolutely don't want to resend a configuration. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
1 parent 8877846 commit ca3abbe

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

sound/soc/sof/intel/hda-dai.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -471,8 +471,9 @@ static int ssp_dai_setup_or_free(struct snd_pcm_substream *substream, struct snd
471471
return hda_ctrl_dai_widget_free(w);
472472
}
473473

474-
static int ssp_dai_prepare(struct snd_pcm_substream *substream,
475-
struct snd_soc_dai *dai)
474+
static int ssp_dai_hw_params(struct snd_pcm_substream *substream,
475+
struct snd_pcm_hw_params *params,
476+
struct snd_soc_dai *dai)
476477
{
477478
return ssp_dai_setup_or_free(substream, dai, true);
478479
}
@@ -484,7 +485,7 @@ static int ssp_dai_hw_free(struct snd_pcm_substream *substream,
484485
}
485486

486487
static const struct snd_soc_dai_ops ssp_dai_ops = {
487-
.prepare = ssp_dai_prepare,
488+
.hw_params = ssp_dai_hw_params,
488489
.hw_free = ssp_dai_hw_free,
489490
};
490491

0 commit comments

Comments
 (0)