diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-22 18:22:22 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-22 18:22:22 +0200 |
| commit | f5ca7a7161028db5ac5bcd06db03d7f2e340a20d (patch) | |
| tree | 8059c861291aceeaa6f4c585d14fc9757e94c135 /sound/core | |
| parent | Merge tag 'powerpc-5.7-5' of git://git.kernel.org/pub/scm/linux/kernel/git/po... (diff) | |
| parent | ALSA: hda/realtek - Add more fixup entries for Clevo machines (diff) | |
| download | linux-f5ca7a7161028db5ac5bcd06db03d7f2e340a20d.tar.xz linux-f5ca7a7161028db5ac5bcd06db03d7f2e340a20d.zip | |
Merge tag 'sound-5.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"Just a few small fixes: the only significant one is a slight
improvement for PCM running position update with no-period-elapsed
case while the rest are HD-audio fixups and ice1712 model quirk"
* tag 'sound-5.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: hda/realtek - Add more fixup entries for Clevo machines
ALSA: iec1712: Initialize STDSP24 properly when using the model=staudio option
ALSA: hda/realtek - Fix silent output on Gigabyte X570 Aorus Xtreme
ALSA: pcm: fix incorrect hw_base increase
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/pcm_lib.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index 872a852de75c..d531e1bc2b81 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -433,6 +433,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream, no_delta_check: if (runtime->status->hw_ptr == new_hw_ptr) { + runtime->hw_ptr_jiffies = curr_jiffies; update_audio_tstamp(substream, &curr_tstamp, &audio_tstamp); return 0; } |