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

Commit ab1863fc authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: pcm - Fix update of runtime->hw_ptr_interrupt 



The commit 13f040f9 made another
regression, the missing update of runtime->hw_ptr_interrupt.
Since this field is only checked in snd_pcmupdate__hw_ptr_interrupt(),
not in snd_pcm_update_hw_ptr(), it must be updated before the hw_ptr
change check.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent d86bf923

sound/core/pcm_lib.c

+2 −1
Original line number Diff line number Diff line
@@ -299,6 +299,8 @@ static int snd_pcm_update_hw_ptr_interrupt(struct snd_pcm_substream *substream) 
		hw_ptr_interrupt =

			new_hw_ptr - new_hw_ptr % runtime->period_size;

	}

	runtime->hw_ptr_interrupt = hw_ptr_interrupt;



	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&

	    runtime->silence_size > 0)

		snd_pcm_playback_silence(substream, new_hw_ptr);
@@ -309,7 +311,6 @@ static int snd_pcm_update_hw_ptr_interrupt(struct snd_pcm_substream *substream) 
	runtime->hw_ptr_base = hw_base;

	runtime->status->hw_ptr = new_hw_ptr;

	runtime->hw_ptr_jiffies = jiffies;

	runtime->hw_ptr_interrupt = hw_ptr_interrupt;

	if (runtime->tstamp_mode == SNDRV_PCM_TSTAMP_ENABLE)

		snd_pcm_gettime(runtime, (struct timespec *)&runtime->status->tstamp);