summaryrefslogtreecommitdiff
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2017-04-28 18:34:14 +0300
committerBjorn Helgaas <bhelgaas@google.com>2017-04-28 18:34:14 +0300
commit94f543b276e99ca311903f1b9fac2db6d1f020d7 (patch)
treeb545dfcc0399f1e764bd4c1005dd2717248e59f2 /drivers/pci
parent13108c625b1db803b7b24702360a735fd764622f (diff)
parentde5bbdd01cf9ee3cd4586b5a970d3ea015c6d7e3 (diff)
downloadlinux-94f543b276e99ca311903f1b9fac2db6d1f020d7.tar.xz
Merge branch 'pci/misc' into next
* pci/misc: PCI: Change pci_host_common_probe() visibility PCI: Fix typo pci_cfg_access_lock() comment PCI: Include pci.h for struct pci_ops definition
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/access.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/access.c b/drivers/pci/access.c
index 9b09cd31158c..74cf5fffb1e1 100644
--- a/drivers/pci/access.c
+++ b/drivers/pci/access.c
@@ -629,7 +629,7 @@ void pci_vpd_release(struct pci_dev *dev)
*
* When access is locked, any userspace reads or writes to config
* space and concurrent lock requests will sleep until access is
- * allowed via pci_cfg_access_unlocked again.
+ * allowed via pci_cfg_access_unlock() again.
*/
void pci_cfg_access_lock(struct pci_dev *dev)
{