From 9cc791ff363387563afc833b871df31a0fdc2edc Mon Sep 17 00:00:00 2001 From: Julian Scheel Date: Fri, 30 Jun 2017 12:00:34 +0200 Subject: [PATCH] FROMLIST: usb: gadget: f_uac1: Fix endpoint reading The endpoint is stored in the lower byte of wIndex, according to USB Audio 1.0 specification, section 5.2.1.1. Link: https://lore.kernel.org/patchwork/patch/805284/ Signed-off-by: Julian Scheel Signed-off-by: Ren Jianing Change-Id: I16634151e98cfb0f7107e96463a20b8fa8d7072f --- 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 1bb66bfbbd2f..535d4f996416 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; - u16 ep = le16_to_cpu(ctrl->wIndex); + u8 ep = le16_to_cpu(ctrl->wIndex) & 0xff; 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) >> 8) & 0xFF); + u8 ep = le16_to_cpu(ctrl->wIndex) & 0xff; u16 len = le16_to_cpu(ctrl->wLength); u16 w_value = le16_to_cpu(ctrl->wValue);