diff options
| author | Jaroslav Kysela <perex@perex.cz> | 2023-01-09 15:11:33 +0100 |
|---|---|---|
| committer | Sasha Levin <sashal@kernel.org> | 2024-03-15 10:48:23 -0400 |
| commit | bfd36b1d1869859af7ba94dc95ec05e74f40d0b7 (patch) | |
| tree | 679d2f8ee99b2088334c72023f616d8c52303f4e | |
| parent | a6f53df52b6687b19c6218edb3d2ac19ecadb4d6 (diff) | |
| download | linux-bfd36b1d1869859af7ba94dc95ec05e74f40d0b7.tar.gz linux-bfd36b1d1869859af7ba94dc95ec05e74f40d0b7.tar.bz2 linux-bfd36b1d1869859af7ba94dc95ec05e74f40d0b7.zip | |
ALSA: usb-audio: Always initialize fixed_rate in snd_usb_find_implicit_fb_sync_format()
[ Upstream commit 291e9da91403e0e628d7692b5ed505100e7b7706 ]
Handle the fallback code path, too.
Fixes: fd28941cff1c ("ALSA: usb-audio: Add new quirk FIXED_RATE for JBL Quantum810 Wireless")
BugLink: https://lore.kernel.org/alsa-devel/Y7frf3N%2FxzvESEsN@kili/
Reported-by: Dan Carpenter <error27@gmail.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Link: https://lore.kernel.org/r/20230109141133.335543-1-perex@perex.cz
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | sound/usb/implicit.c | 3 | ||||
| -rw-r--r-- | sound/usb/pcm.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sound/usb/implicit.c b/sound/usb/implicit.c index 41ac7185b42b..4727043fd745 100644 --- a/sound/usb/implicit.c +++ b/sound/usb/implicit.c @@ -471,7 +471,7 @@ snd_usb_find_implicit_fb_sync_format(struct snd_usb_audio *chip, subs = find_matching_substream(chip, stream, target->sync_ep, target->fmt_type); if (!subs) - return sync_fmt; + goto end; high_score = 0; list_for_each_entry(fp, &subs->fmt_list, list) { @@ -485,6 +485,7 @@ snd_usb_find_implicit_fb_sync_format(struct snd_usb_audio *chip, } } + end: if (fixed_rate) *fixed_rate = snd_usb_pcm_has_fixed_rate(subs); return sync_fmt; diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index 962a6e1bc70c..580e2649641e 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -163,6 +163,8 @@ bool snd_usb_pcm_has_fixed_rate(struct snd_usb_substream *subs) struct snd_usb_audio *chip = subs->stream->chip; int rate = -1; + if (!subs) + return false; if (!(chip->quirk_flags & QUIRK_FLAG_FIXED_RATE)) return false; list_for_each_entry(fp, &subs->fmt_list, list) { |