diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-10 14:52:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-10 14:52:45 -0700 |
| commit | 4e082e9ba7cdd7466b1ea81527feb93f4da8c580 (patch) | |
| tree | 68092acc840dc1df09813b2808a88fc7b0847a26 /include/linux | |
| parent | 26273939ace935dd7553b31d279eab30b40f7b9a (diff) | |
| parent | 8466489ef5ba48272ba4fa4ea9f8f403306de4c7 (diff) | |
| download | linux-4e082e9ba7cdd7466b1ea81527feb93f4da8c580.tar.gz linux-4e082e9ba7cdd7466b1ea81527feb93f4da8c580.tar.bz2 linux-4e082e9ba7cdd7466b1ea81527feb93f4da8c580.zip | |
Merge tag 'pci-v4.13-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fix from Bjorn Helgaas:
"Work around Renesas uPD72020x 32-bit DMA issue"
* tag 'pci-v4.13-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
xhci: Reset Renesas uPD72020x USB controller for 32-bit DMA issue
PCI: Add pci_reset_function_locked()
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 4869e66dd659..a75c13673852 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1067,6 +1067,7 @@ void pcie_flr(struct pci_dev *dev); int __pci_reset_function(struct pci_dev *dev); int __pci_reset_function_locked(struct pci_dev *dev); int pci_reset_function(struct pci_dev *dev); +int pci_reset_function_locked(struct pci_dev *dev); int pci_try_reset_function(struct pci_dev *dev); int pci_probe_reset_slot(struct pci_slot *slot); int pci_reset_slot(struct pci_slot *slot); |