From 7f9b7bd721a861ee03d18e7b93bab2d73361597e Mon Sep 17 00:00:00 2001 From: Yue Wang Date: Thu, 4 Apr 2019 13:47:18 +0800 Subject: [PATCH] usb: bringup TM2 usb3 [2/2] PD#SWPL-5609 Problem: bringup TM2 usb3. Solution: bringup TM2 usb3. Verify: TM2 Change-Id: Ib2c80e7e586ddbe6f85a6d046efdbd650b81b030 Signed-off-by: Yue Wang --- drivers/usb/core/hub.c | 2 ++ drivers/usb/host/xhci-hub.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index f7f6a00..f21a90b 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -4193,8 +4193,10 @@ static int hub_port_disable(struct usb_hub *hub, int port1, int set_state) } if (port_dev->child && set_state) usb_set_device_state(port_dev->child, USB_STATE_NOTATTACHED); +#ifndef CONFIG_AMLOGIC_USB if (ret && ret != -ENODEV) dev_err(&port_dev->dev, "cannot disable (err = %d)\n", ret); +#endif return ret; } diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c index e7312f5..89c9165 100644 --- a/drivers/usb/host/xhci-hub.c +++ b/drivers/usb/host/xhci-hub.c @@ -1324,7 +1324,9 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, */ if ((temp & PORT_PE) == 0 || (link_state > USB_SS_PORT_LS_U3)) { +#ifndef CONFIG_AMLOGIC_USB xhci_warn(xhci, "Cannot set link state.\n"); +#endif goto error; } -- 2.7.4