From: Takashi Iwai Date: Fri, 25 Jan 2019 16:31:59 +0000 (+0100) Subject: ALSA: pcm: Use the common error path in __snd_pcm_lib_xfer() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=315d9f1bee40b20d399176acb1e27036abbd4384;p=linux.git ALSA: pcm: Use the common error path in __snd_pcm_lib_xfer() An open-coded error path in __snd_pcm_lib_xfer() can be replaced with the simple goto to the common error path. This also makes the error handling more consistent, i.e. when some samples have been already processed, return that size instead of the error code. Signed-off-by: Takashi Iwai --- diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index 40013b26f6719..f48efce937adc 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -2219,9 +2219,8 @@ snd_pcm_sframes_t __snd_pcm_lib_xfer(struct snd_pcm_substream *substream, if (frames > cont) frames = cont; if (snd_BUG_ON(!frames)) { - runtime->twake = 0; - snd_pcm_stream_unlock_irq(substream); - return -EINVAL; + err = -EINVAL; + goto _end_unlock; } snd_pcm_stream_unlock_irq(substream); err = writer(substream, appl_ofs, data, offset, frames,