Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: sti: Use snd_pcm_stop_xrun() helper

Browse Source 
The XRUN trigger from the driver should be done via
snd_pcm_stop_xrun().  It fixes the missing stream locking as a gratis,
too.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Takashi Iwai 2018-07-04 16:01:45 +02:00 committed by Mark Brown
parent 1a42e7e3af
commit dc865fb9e7
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/soc/sti/uniperif_player.c
View File

@ -91,7 +91,7 @@ static irqreturn_t uni_player_irq_handler(int irq, void *dev_id)
SET_UNIPERIF_ITM_BCLR_FIFO_ERROR(player);
/* Stop the player */
snd_pcm_stop(player->substream, SNDRV_PCM_STATE_XRUN);
snd_pcm_stop_xrun(player->substream);
}
ret = IRQ_HANDLED;
@ -105,7 +105,7 @@ static irqreturn_t uni_player_irq_handler(int irq, void *dev_id)
SET_UNIPERIF_ITM_BCLR_DMA_ERROR(player);
/* Stop the player */
snd_pcm_stop(player->substream, SNDRV_PCM_STATE_XRUN);
snd_pcm_stop_xrun(player->substream);
ret = IRQ_HANDLED;
}
@ -138,7 +138,7 @@ static irqreturn_t uni_player_irq_handler(int irq, void *dev_id)
dev_err(player->dev, "Underflow recovery failed\n");
/* Stop the player */
snd_pcm_stop(player->substream, SNDRV_PCM_STATE_XRUN);
snd_pcm_stop_xrun(player->substream);
ret = IRQ_HANDLED;
}

2
sound/soc/sti/uniperif_reader.c
View File

@ -65,7 +65,7 @@ static irqreturn_t uni_reader_irq_handler(int irq, void *dev_id)
if (unlikely(status & UNIPERIF_ITS_FIFO_ERROR_MASK(reader))) {
dev_err(reader->dev, "FIFO error detected\n");
snd_pcm_stop(reader->substream, SNDRV_PCM_STATE_XRUN);
snd_pcm_stop_xrun(reader->substream);
ret = IRQ_HANDLED;
}