[-,PCM,rate,v2,1/1] pcm: rate: Add error check for snd_pcm_avail_update()
diff mbox

Message ID 1530711589-3919-1-git-send-email-twischer@de.adit-jv.com
State New
Headers show

Commit Message

Timo Wischer July 4, 2018, 1:39 p.m. UTC
From: Timo Wischer <twischer@de.adit-jv.com>

Without these changes a negative error code returned by
snd_pcm_avail_update() will be not handled correctly.

With this patch the returned error code of snd_pcm_avail_update() will be
returned by snd_pcm_rate_avail_update().

Signed-off-by: Timo Wischer <twischer@de.adit-jv.com>
---
Compared to v1[1] of this patch only the changelog and the subject has changed.

[1] http://mailman.alsa-project.org/pipermail/alsa-devel/2018-July/137838.html

Comments

Takashi Iwai July 4, 2018, 1:42 p.m. UTC | #1
On Wed, 04 Jul 2018 15:39:49 +0200,
<twischer@de.adit-jv.com> wrote:
> 
> From: Timo Wischer <twischer@de.adit-jv.com>
> 
> Without these changes a negative error code returned by
> snd_pcm_avail_update() will be not handled correctly.
> 
> With this patch the returned error code of snd_pcm_avail_update() will be
> returned by snd_pcm_rate_avail_update().
> 
> Signed-off-by: Timo Wischer <twischer@de.adit-jv.com>
> ---
> Compared to v1[1] of this patch only the changelog and the subject has changed.
> 
> [1] http://mailman.alsa-project.org/pipermail/alsa-devel/2018-July/137838.html

Applied now.  Thanks.


Takashi

Patch
diff mbox

diff --git a/src/pcm/pcm_rate.c b/src/pcm/pcm_rate.c
index 4e0c7ca..031a43d 100644
--- a/src/pcm/pcm_rate.c
+++ b/src/pcm/pcm_rate.c
@@ -970,9 +970,12 @@  static snd_pcm_sframes_t snd_pcm_rate_avail_update(snd_pcm_t *pcm)
 {
 	snd_pcm_rate_t *rate = pcm->private_data;
 	snd_pcm_t *slave = rate->gen.slave;
-	snd_pcm_uframes_t slave_size;
+	snd_pcm_sframes_t slave_size;
 
 	slave_size = snd_pcm_avail_update(slave);
+	if (slave_size < 0)
+		return slave_size;
+
 	if (pcm->stream == SND_PCM_STREAM_CAPTURE)
 		goto _capture;
 	snd_pcm_rate_sync_hwptr(pcm);