summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com>2023-11-05 18:51:16 -0800
committerSecurityBot <android-nexus-securitybot@system.gserviceaccount.com>2023-11-05 18:51:16 -0800
commit7f5023f4eb57f539157601462f8c0b474f892129 (patch)
treeb0f08d3941df91f0ca4c35e9556643e80ef97b14
parent35e06d6bda27b88e8d92e07d9ba17dafc34d2233 (diff)
parent9f9587e44632e4c0e0091383b723429a3f10412e (diff)
downloadaoc-7f5023f4eb57f539157601462f8c0b474f892129.tar.gz
Merge android14-gs-pixel-5.15-24Q1 into android14-gs-pixel-5.15
SBMerger: 571992243 Change-Id: I7dc19f753db112fcc02e08a5fed86fa4e7461dce Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
-rw-r--r--alsa/aoc_alsa_usb.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/alsa/aoc_alsa_usb.c b/alsa/aoc_alsa_usb.c
index 9b959bd..ad45d0a 100644
--- a/alsa/aoc_alsa_usb.c
+++ b/alsa/aoc_alsa_usb.c
@@ -75,6 +75,8 @@ void usb_audio_offload_connect(struct snd_usb_audio *chip)
mutex_lock(&chip->mutex);
uadev[card_num].chip = chip;
uadev[card_num].card_num = card_num;
+ chip->quirk_flags &= ~QUIRK_FLAG_GENERIC_IMPLICIT_FB;
+ chip->quirk_flags |= QUIRK_FLAG_SKIP_IMPLICIT_FB;
mutex_unlock(&chip->mutex);
}