Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 36699
b: refs/heads/master
c: 2e3a43f
h: refs/heads/master
i:
  36697: c057698
  36695: bc661c5
v: v3
  • Loading branch information
Alan Cox authored and Greg Kroah-Hartman committed Sep 28, 2006
1 parent 68a2763 commit 91663aa
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 54bee6e1b455573658972510a76119f279db32b7
refs/heads/master: 2e3a43f0b6f16705ec76d3744b82a116965ebebe
3 changes: 2 additions & 1 deletion trunk/drivers/usb/host/ohci-pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,14 @@ ohci_pci_start (struct usb_hcd *hcd)
else if (pdev->vendor == PCI_VENDOR_ID_NS) {
struct pci_dev *b;

b = pci_find_slot (pdev->bus->number,
b = pci_get_slot (pdev->bus,
PCI_DEVFN (PCI_SLOT (pdev->devfn), 1));
if (b && b->device == PCI_DEVICE_ID_NS_87560_LIO
&& b->vendor == PCI_VENDOR_ID_NS) {
ohci->flags |= OHCI_QUIRK_SUPERIO;
ohci_dbg (ohci, "Using NSC SuperIO setup\n");
}
pci_dev_put(b);
}

/* Check for Compaq's ZFMicro chipset, which needs short
Expand Down

0 comments on commit 91663aa

Please sign in to comment.