Unverified Commit c26830b6 authored by Neil Armstrong's avatar Neil Armstrong Committed by Mark Brown
Browse files

ASoC: meson: axg-tdm-interface: Fix formatters in trigger" 



This reverts commit bf5e4887 because
the following and required commit e138233e
causes the following system crash when using audio:
 BUG: sleeping function called from invalid context at kernel/locking/mutex.c:282

Fixes: bf5e4887 ("ASoC: meson: axg-tdm-interface: manage formatters in trigger")
Reported-by: default avatarDmitry Shmidt <dimitrysh@google.com>
Signed-off-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Acked-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Link: https://lore.kernel.org/r/20220421155725.2589089-1-narmstrong@baylibre.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent eb577320

sound/soc/meson/axg-tdm-interface.c

+5 −21
Original line number Diff line number Diff line
@@ -351,29 +351,13 @@ static int axg_tdm_iface_hw_free(struct snd_pcm_substream *substream, 
	return 0;

}



static int axg_tdm_iface_trigger(struct snd_pcm_substream *substream,

				 int cmd,

static int axg_tdm_iface_prepare(struct snd_pcm_substream *substream,

				 struct snd_soc_dai *dai)

{

	struct axg_tdm_stream *ts =

		snd_soc_dai_get_dma_data(dai, substream);



	switch (cmd) {

	case SNDRV_PCM_TRIGGER_START:

	case SNDRV_PCM_TRIGGER_RESUME:

	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:

		axg_tdm_stream_start(ts);

		break;

	case SNDRV_PCM_TRIGGER_SUSPEND:

	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:

	case SNDRV_PCM_TRIGGER_STOP:

		axg_tdm_stream_stop(ts);

		break;

	default:

		return -EINVAL;

	}

	struct axg_tdm_stream *ts = snd_soc_dai_get_dma_data(dai, substream);



	return 0;

	/* Force all attached formatters to update */

	return axg_tdm_stream_reset(ts);

}



static int axg_tdm_iface_remove_dai(struct snd_soc_dai *dai)
@@ -413,8 +397,8 @@ static const struct snd_soc_dai_ops axg_tdm_iface_ops = { 
	.set_fmt	= axg_tdm_iface_set_fmt,

	.startup	= axg_tdm_iface_startup,

	.hw_params	= axg_tdm_iface_hw_params,

	.prepare	= axg_tdm_iface_prepare,

	.hw_free	= axg_tdm_iface_hw_free,

	.trigger	= axg_tdm_iface_trigger,

};



/* TDM Backend DAIs */