]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ALSA: usb-audio: Correct the return code from snd_usb_endpoint_set_params()
authorTakashi Iwai <tiwai@suse.de>
Sun, 9 Oct 2022 10:42:11 +0000 (12:42 +0200)
committerSasha Levin <sashal@kernel.org>
Fri, 15 Mar 2024 14:48:18 +0000 (10:48 -0400)
[ Upstream commit 9355b60e401d825590d37f04ea873c58efe9b7bf ]

snd_usb_endpoint_set_params() should return zero for a success, but
currently it returns the sample rate.  Correct it.

Fixes: 2be79d586454 ("ALSA: usb-audio: Split endpoint setups for hw_params and prepare (take#2)")
Link: https://lore.kernel.org/r/20221009104212.18877-4-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Stable-dep-of: 7822baa844a8 ("ALSA: usb-audio: add quirk for RODE NT-USB+")
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/usb/endpoint.c

index 486ef6b022552ca7b57f8d2d4d06fe9b83759666..80ead3db4d1c7b9177d8071042f458c2778acd5a 100644 (file)
@@ -1388,6 +1388,8 @@ int snd_usb_endpoint_set_params(struct snd_usb_audio *chip,
        ep->curframesize = ep->curpacksize / ep->cur_frame_bytes;
 
        err = update_clock_ref_rate(chip, ep);
+       if (err >= 0)
+               err = 0;
  unlock:
        mutex_unlock(&chip->mutex);
        return err;