diff options
| author | Jack Pham <jackp@codeaurora.org> | 2021-09-14 18:00:08 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2021-09-15 06:54:43 +0000 |
| commit | 6773d5cd773f65a55be6e115c5cd458593e02477 (patch) | |
| tree | 498c3c1ab0a771d21343f1db44b6b2a603838e36 | |
| parent | e6e66cb3dd7378c39023247e2b385cdbb6017bc3 (diff) | |
| download | common-6773d5cd773f65a55be6e115c5cd458593e02477.tar.gz | |
Revert "FROMLIST: usb: gadget: f_uac2: Add missing companion descriptor for feedback EP"
This reverts commit ab9ceb4334cd02e593c0eae77f54f6d75103846d.
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>
| -rw-r--r-- | drivers/usb/gadget/function/f_uac2.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/usb/gadget/function/f_uac2.c b/drivers/usb/gadget/function/f_uac2.c index 4b506412e273..bdc7e6e78455 100644 --- a/drivers/usb/gadget/function/f_uac2.c +++ b/drivers/usb/gadget/function/f_uac2.c @@ -527,7 +527,6 @@ static struct usb_descriptor_header *ss_audio_desc[] = { (struct usb_descriptor_header *)&ss_epout_desc_comp, (struct usb_descriptor_header *)&as_iso_out_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_if1_desc, @@ -661,11 +660,8 @@ static void setup_headers(struct f_uac2_opts *opts, 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); - if (epin_desc_comp) - headers[i++] = USBDHDR(epin_desc_comp); - } } if (EPIN_EN(opts)) { headers[i++] = USBDHDR(&std_as_in_if0_desc); |