From f621aa5e2c04ff8bc63d5f10447130cfb6bf435d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= Date: Tue, 10 Nov 2015 07:51:46 +0100 Subject: [PATCH] alsa-sink: Avoid unloading alsa-sink module before calling try_recover() This fixes rare condition when pulseaudio client tries to rewind, but a device previously reached underrun and was changed to XRUN state. --- src/modules/alsa/alsa-sink.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c index b6c7d09ae..476188c6b 100644 --- a/src/modules/alsa/alsa-sink.c +++ b/src/modules/alsa/alsa-sink.c @@ -1628,8 +1628,10 @@ static int process_rewind(struct userdata *u) { pa_log_debug("Requested to rewind %lu bytes.", (unsigned long) rewind_nbytes); if (PA_UNLIKELY((unused = pa_alsa_safe_avail(u->pcm_handle, u->hwbuf_size, &u->sink->sample_spec)) < 0)) { - pa_log("snd_pcm_avail() failed: %s", pa_alsa_strerror((int) unused)); - return -1; + if (try_recover(u, "snd_pcm_avail", (int) unused) < 0) { + pa_log_warn("Trying to recover from underrun failed during rewind"); + return -1; + } } unused_nbytes = (size_t) unused * u->frame_size;