diff options
| author | Tony LIU <junjie.liu@freescale.com> | 2011-12-22 19:07:03 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2012-07-20 13:19:23 +0800 |
| commit | 8fe7ab5117564605c800f90467f7d22ca858de66 (patch) | |
| tree | dcc3b55bd7af364ef872f9664ee7bdc96c4782eb /drivers/usb/core | |
| parent | 7d044dfd08509c7d2f8fee3cfa364d52d7b5fcfc (diff) | |
ENGR00170144 [USB-Host] Fix the following USB hub issue on mx6q
- After auto suspend, attach device to hub will cause host can't work any more
- after system suspend, attach device to hub will cause host can't work any more
- HSDISCONNECTDEC logic error
- Set RUNSTOP in bus suspend, if no short delay, host can't work any more
Signed-off-by: Tony LIU <junjie.liu@freescale.com>
Diffstat (limited to 'drivers/usb/core')
| -rw-r--r-- | drivers/usb/core/hub.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 1fc9e2e8a99f..2eb71ec3924e 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -3031,7 +3031,7 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1, } #ifdef MX6_USB_HOST_HACK { /*Must enable HOSTDISCONDETECT after second reset*/ - if (port1 == 1) { + if ((port1 == 1) && (udev->level == 1)) { if (udev->speed == USB_SPEED_HIGH) { struct device *dev = hcd->self.controller; struct fsl_usb2_platform_data *pdata; @@ -3185,11 +3185,11 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1, struct fsl_usb2_platform_data *pdata; pdata = (struct fsl_usb2_platform_data *)dev->platform_data; - if (dev->parent && dev->type) { + if (dev->parent && (hdev->level == 0) && dev->type) { if (port1 == 1 && pdata->init) pdata->init(NULL); } - if (port1 == 1) { + if ((port1 == 1) && (hdev->level == 0)) { if (!(portstatus&USB_PORT_STAT_CONNECTION)) { /* Must clear HOSTDISCONDETECT when disconnect*/ fsl_platform_set_usb_phy_dis(pdata, 0); |