shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-03-25 03:50:24 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ALSA: usb-audio: Always initialize fixed_rate in snd_usb_find_implicit_fb_sync_format()"

Browse Source 
This reverts commit bfd36b1d18 which is
commit 291e9da914 upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: I087bfd704d03c5aef4cf14d6130d0c310ea9313a
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2024-05-16 10:15:31 +00:00
parent c799355799
commit 7dcba26902
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sound/usb/implicit.c
View File

@@ -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)
goto end;
return sync_fmt;
high_score = 0;
list_for_each_entry(fp, &subs->fmt_list, list) {
@@ -485,7 +485,6 @@ 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;

2
sound/usb/pcm.c
View File

@@ -172,8 +172,6 @@ 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) {