Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 195396
b: refs/heads/master
c: 3681d8f
h: refs/heads/master
v: v3
  • Loading branch information
David Miller authored and Greg Kroah-Hartman committed May 20, 2010
1 parent b976b58 commit c57789f
Show file tree
Hide file tree
Showing 2 changed files with 4 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: 9ed3fd6c10a161626120862d39f0211657d7c876
refs/heads/master: 3681d8f3ee8f47b60b4621a3d80f8d1d39e7185b
3 changes: 3 additions & 0 deletions trunk/drivers/usb/host/ehci-pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,9 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
return retval;

switch (pdev->vendor) {
case PCI_VENDOR_ID_NEC:
ehci->need_io_watchdog = 0;
break;
case PCI_VENDOR_ID_INTEL:
ehci->need_io_watchdog = 0;
if (pdev->device == 0x27cc) {
Expand Down

0 comments on commit c57789f

Please sign in to comment.