Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d807cdfb authored by Olivier Moysan's avatar Olivier Moysan Committed by Mark Brown
Browse files

ASoC: stm32: sai: fix stop management in isr 



Add check on substream validity.

Signed-off-by: default avatarOlivier Moysan <olivier.moysan@st.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 2bd6bf03

sound/soc/stm/stm32_sai_sub.c

+8 −4
Original line number Diff line number Diff line
@@ -184,7 +184,6 @@ static const struct regmap_config stm32_sai_sub_regmap_config_h7 = { 
static irqreturn_t stm32_sai_isr(int irq, void *devid)

{

	struct stm32_sai_sub_data *sai = (struct stm32_sai_sub_data *)devid;

	struct snd_pcm_substream *substream = sai->substream;

	struct platform_device *pdev = sai->pdev;

	unsigned int sr, imr, flags;

	snd_pcm_state_t status = SNDRV_PCM_STATE_RUNNING;
@@ -199,6 +198,11 @@ static irqreturn_t stm32_sai_isr(int irq, void *devid) 
	regmap_update_bits(sai->regmap, STM_SAI_CLRFR_REGX, SAI_XCLRFR_MASK,

			   SAI_XCLRFR_MASK);



	if (!sai->substream) {

		dev_err(&pdev->dev, "Device stopped. Spurious IRQ 0x%x\n", sr);

		return IRQ_NONE;

	}



	if (flags & SAI_XIMR_OVRUDRIE) {

		dev_err(&pdev->dev, "IRQ %s\n",

			STM_SAI_IS_PLAYBACK(sai) ? "underrun" : "overrun");
@@ -227,9 +231,9 @@ static irqreturn_t stm32_sai_isr(int irq, void *devid) 
	}



	if (status != SNDRV_PCM_STATE_RUNNING) {

		snd_pcm_stream_lock(substream);

		snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN);

		snd_pcm_stream_unlock(substream);

		snd_pcm_stream_lock(sai->substream);

		snd_pcm_stop(sai->substream, SNDRV_PCM_STATE_XRUN);

		snd_pcm_stream_unlock(sai->substream);

	}



	return IRQ_HANDLED;