Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 226923
b: refs/heads/master
c: 4f68384
h: refs/heads/master
i:
  226921: f36a2b8
  226919: 0bf3c4d
v: v3
  • Loading branch information
Dirk Brandewie authored and Greg Kroah-Hartman committed Nov 17, 2010
1 parent 2aecabd commit feb3f57
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2f15744c1d90ee2e82f8ae5724b44b1cdf31715c
refs/heads/master: 4f6838436915fdc281173bfd5bef6d8ab5cb1a7f
7 changes: 7 additions & 0 deletions trunk/drivers/usb/host/ehci-pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
#error "This file is PCI bus glue. CONFIG_PCI must be defined."
#endif

/* defined here to avoid adding to pci_ids.h for single instance use */
#define PCI_DEVICE_ID_INTEL_CE4100_USB 0x2e70

/*-------------------------------------------------------------------------*/

/* called after powerup, by probe or system-pm "wakeup" */
Expand Down Expand Up @@ -124,6 +127,10 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
ehci_info(ehci, "disable lpm for langwell/penwell\n");
ehci->has_lpm = 0;
}
if (pdev->device == PCI_DEVICE_ID_INTEL_CE4100_USB) {
hcd->has_tt = 1;
tdi_reset(ehci);
}
break;
case PCI_VENDOR_ID_TDI:
if (pdev->device == PCI_DEVICE_ID_TDI_EHCI) {
Expand Down

0 comments on commit feb3f57

Please sign in to comment.