diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-22 22:53:47 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-22 22:53:47 +0400 |
| commit | e3414786ffb40a1fd524624369d350ed70a90a08 (patch) | |
| tree | b4247a5e7c2335e9fa8b2ab6ac57ede3d2576f52 /drivers/pci/syscall.c | |
| parent | b0e3636f656c98bdeded5aaa78601e3256b18d6d (diff) | |
| parent | e7cc5cf74544d97d7b69e2701595037474db1f96 (diff) | |
| download | linux-e3414786ffb40a1fd524624369d350ed70a90a08.tar.xz | |
Merge tag 'pci-v3.13-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI updates from Bjorn Helgaas:
"Miscellaneous
- Remove duplicate disable from pcie_portdrv_remove() (Yinghai Lu)
- Fix whitespace, capitalization, and spelling errors (Bjorn Helgaas)"
* tag 'pci-v3.13-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI: Remove duplicate pci_disable_device() from pcie_portdrv_remove()
PCI: Fix whitespace, capitalization, and spelling errors
Diffstat (limited to 'drivers/pci/syscall.c')
| -rw-r--r-- | drivers/pci/syscall.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/syscall.c b/drivers/pci/syscall.c index e1c1ec540893..24750a1b39b6 100644 --- a/drivers/pci/syscall.c +++ b/drivers/pci/syscall.c @@ -44,7 +44,7 @@ SYSCALL_DEFINE5(pciconfig_read, unsigned long, bus, unsigned long, dfn, default: err = -EINVAL; goto error; - }; + } err = -EIO; if (cfg_ret != PCIBIOS_SUCCESSFUL) |