aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2022-10-09 12:42:11 +0200
committerTakashi Iwai <tiwai@suse.de>2022-10-09 12:43:26 +0200
commit9355b60e401d825590d37f04ea873c58efe9b7bf (patch)
treed23e50ff06515717ad972170f0fb2741570f3e1e /sound/usb
parentALSA: usb-audio: Apply mutex around snd_usb_endpoint_set_params() (diff)
downloadlinux-dev-9355b60e401d825590d37f04ea873c58efe9b7bf.tar.xz
linux-dev-9355b60e401d825590d37f04ea873c58efe9b7bf.zip
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>
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/endpoint.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c
index da378e565ef8..44cce6cec9da 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;