git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
[pandora-kernel.git]
/
drivers
/
usb
/
host
/
xhci-pci.c
diff --git
a/drivers/usb/host/xhci-pci.c
b/drivers/usb/host/xhci-pci.c
index
edffd81
..
11482b6
100644
(file)
--- a/
drivers/usb/host/xhci-pci.c
+++ b/
drivers/usb/host/xhci-pci.c
@@
-78,6
+78,8
@@
static int xhci_pci_setup(struct usb_hcd *hcd)
xhci_dbg(xhci, "QUIRK: Fresco Logic xHC needs configure"
" endpoint cmd after reset endpoint\n");
}
xhci_dbg(xhci, "QUIRK: Fresco Logic xHC needs configure"
" endpoint cmd after reset endpoint\n");
}
+ if (pdev->vendor == PCI_VENDOR_ID_NEC)
+ xhci->quirks |= XHCI_NEC_HOST;
/* Make sure the HC is halted. */
retval = xhci_halt(xhci);
/* Make sure the HC is halted. */
retval = xhci_halt(xhci);