From f6bf4fa1ed43675e84656fd220157f3e850b553b Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Wed, 1 Dec 2021 19:54:33 +0800 Subject: [PATCH] Revert "FROMLIST: usb: gadget: f_uac1: Fix endpoint reading" This reverts commit d390fcf2f7e21148547619a5052f0257c91296c2. Signed-off-by: Tao Huang Change-Id: I96f63c724254ac46dab01360341e71587e9bb2ea --- drivers/usb/gadget/function/f_uac1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c index e745e901b3b7..1ca800a45dae 100644 --- a/drivers/usb/gadget/function/f_uac1.c +++ b/drivers/usb/gadget/function/f_uac1.c @@ -337,7 +337,7 @@ static int audio_set_endpoint_req(struct usb_function *f, { struct usb_composite_dev *cdev = f->config->cdev; int value = -EOPNOTSUPP; - u8 ep = le16_to_cpu(ctrl->wIndex) & 0xff; + u16 ep = le16_to_cpu(ctrl->wIndex); u16 len = le16_to_cpu(ctrl->wLength); u16 w_value = le16_to_cpu(ctrl->wValue); @@ -373,7 +373,7 @@ static int audio_get_endpoint_req(struct usb_function *f, { struct usb_composite_dev *cdev = f->config->cdev; int value = -EOPNOTSUPP; - u8 ep = le16_to_cpu(ctrl->wIndex) & 0xff; + u8 ep = ((le16_to_cpu(ctrl->wIndex) >> 8) & 0xFF); u16 len = le16_to_cpu(ctrl->wLength); u16 w_value = le16_to_cpu(ctrl->wValue);