From: Takashi Iwai <tiwai@suse.de>
Date: Sun, 9 Oct 2022 10:42:11 +0000 (+0200)
Subject: ALSA: usb-audio: Correct the return code from snd_usb_endpoint_set_params()
X-Git-Tag: v6.1-rc1~17^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9355b60e401d825590d37f04ea873c58efe9b7bf;p=thirdparty%2Fkernel%2Flinux.git

ALSA: usb-audio: Correct the return code from snd_usb_endpoint_set_params()

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>
---

diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c
index da378e565ef84..44cce6cec9dac 100644
--- a/sound/usb/endpoint.c
+++ b/sound/usb/endpoint.c
@@ -1386,6 +1386,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;