github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-10 07:32:29 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

merge from kernel 2.6.32 develop

Browse Source
This commit is contained in:
lintao 2011-11-22 11:54:23 +08:00
parent 4949870baf
commit 33f26b29b6
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/usb/core/hub.c
View File

@ -2888,11 +2888,17 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1,
udev->ttport = hdev->ttport;
} else if (udev->speed != USB_SPEED_HIGH
&& hdev->speed == USB_SPEED_HIGH) {
/* yk@rk 20110617
* parent hub has no TT would not be error in rk29
*/
#if 0
if (!hub->tt.hub) {
dev_err(&udev->dev, "parent hub has no TT\n");
retval = -EINVAL;
goto fail;
}
#endif
udev->tt = &hub->tt;
udev->ttport = port1;
}

1
drivers/usb/dwc_otg/dwc_otg_cil.c
View File

@ -2420,6 +2420,7 @@ void dwc_otg_ep0_start_transfer(dwc_otg_core_if_t *_core_if, dwc_ep_t *_ep)
{
dwc_write_reg32 (&(in_regs->diepdma),
(uint32_t)_ep->dma_addr);
_ep->dma_addr += _ep->xfer_len;
}
/* EP enable, IN data in FIFO */

6
drivers/usb/dwc_otg/dwc_otg_hcd_intr.c
View File

@ -519,6 +519,12 @@ int32_t dwc_otg_hcd_handle_hc_intr (dwc_otg_hcd_t *_dwc_otg_hcd)
retval |= dwc_otg_hcd_handle_hc_n_intr (_dwc_otg_hcd, hcnum);
}
}
haint.d32 = dwc_otg_read_host_all_channels_intr(_dwc_otg_hcd->core_if);
int i;
for (i = 0; i < _dwc_otg_hcd->core_if->core_params->host_channels; i++) {
if (haint.b2.chint & (1 << i))
retval |= dwc_otg_hcd_handle_hc_n_intr(_dwc_otg_hcd, i);
}
#endif
return retval;
}