xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "FROMLIST: usb: gadget: f_uac2: Add missing companion descriptor for feedback EP"

Browse Source 
This reverts commit ab9ceb4334.

The change ended up getting reworked in upstream, so revert and
reapply the latest change that merged.

Bug: 199044440
Change-Id: If03d1c4a063e182e02b4a9b55c6e702ce860c2e0
Signed-off-by: Jack Pham <jackp@codeaurora.org>
This commit is contained in:
Jack Pham
2021-09-14 18:00:08 -07:00
committed by Greg Kroah-Hartman
parent e6e66cb3dd
commit 6773d5cd77
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/usb/gadget/function/f_uac2.c
View File

@@ -527,7 +527,6 @@ static struct usb_descriptor_header *ss_audio_desc[] = {
(struct usb_descriptor_header *)&ss_epout_desc_comp, (struct usb_descriptor_header *)&ss_epout_desc_comp,
(struct usb_descriptor_header *)&as_iso_out_desc, (struct usb_descriptor_header *)&as_iso_out_desc,
(struct usb_descriptor_header *)&ss_epin_fback_desc, (struct usb_descriptor_header *)&ss_epin_fback_desc,
(struct usb_descriptor_header *)&ss_epin_desc_comp,
(struct usb_descriptor_header *)&std_as_in_if0_desc, (struct usb_descriptor_header *)&std_as_in_if0_desc,
(struct usb_descriptor_header *)&std_as_in_if1_desc, (struct usb_descriptor_header *)&std_as_in_if1_desc,
@@ -661,11 +660,8 @@ static void setup_headers(struct f_uac2_opts *opts,
headers[i++] = USBDHDR(&as_iso_out_desc); headers[i++] = USBDHDR(&as_iso_out_desc);
if (EPOUT_FBACK_IN_EN(opts)) { if (EPOUT_FBACK_IN_EN(opts))
headers[i++] = USBDHDR(epin_fback_desc); headers[i++] = USBDHDR(epin_fback_desc);
if (epin_desc_comp)
headers[i++] = USBDHDR(epin_desc_comp);
}
} }
if (EPIN_EN(opts)) { if (EPIN_EN(opts)) {
headers[i++] = USBDHDR(&std_as_in_if0_desc); headers[i++] = USBDHDR(&std_as_in_if0_desc);