From mboxrd@z Thu Jan 1 00:00:00 1970 From: Anand Moon Date: Sat, 5 Mar 2016 19:13:13 +1030 Subject: [U-Boot] [U-BOOT.V2] usb: xhci: Fix vendor command error if the request Message-ID: <1457167393-2559-1-git-send-email-linux.amoon@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de From: Ted Chen From: Ted Chen type is USB_REQ_SET_ADDRESS or USB_REQ_SET_CONFIGURATION. To: marex at denx.de, swarren at nvidia.com, u-boot at lists.denx.de Cc: linux.amoon at gmail.com, Ted Chen Add a condition of set_address and set_configuration to check if the request is standardized. Signed-off-by: Ted Chen --- Resend this patch it some how got missed Changes since v1: None. Tested on Odroid XU4: with Ethernet USB3.0 RT8153-VB --- drivers/usb/host/xhci.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index ca598aa..cb8a04b 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -941,10 +941,12 @@ static int _xhci_submit_control_msg(struct usb_device *udev, unsigned long pipe, if (usb_pipedevice(pipe) == ctrl->rootdev) return xhci_submit_root(udev, pipe, buffer, setup); - if (setup->request == USB_REQ_SET_ADDRESS) + if (setup->request == USB_REQ_SET_ADDRESS && + (setup->requesttype & USB_TYPE_MASK) == USB_TYPE_STANDARD) return xhci_address_device(udev, root_portnr); - if (setup->request == USB_REQ_SET_CONFIGURATION) { + if (setup->request == USB_REQ_SET_CONFIGURATION && + (setup->requesttype & USB_TYPE_MASK) == USB_TYPE_STANDARD) { ret = xhci_set_configuration(udev); if (ret) { puts("Failed to configure xHCI endpoint\n"); -- 1.9.1