diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-12-17 09:27:08 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-12-17 09:27:08 -0500 |
| commit | bb799d3b980eb803ca2da4a4eefbd9308f8d988a (patch) | |
| tree | 69fbe0cd6d47b23a50f5e1d87bf7489532fae149 /drivers/pci/syscall.c | |
| parent | 919fc6e34831d1c2b58bfb5ae261dc3facc9b269 (diff) | |
| parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
Merge tag 'v3.13-rc4' into core/locking
Merge Linux 3.13-rc4, to refresh this rather old tree with the latest fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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, | |||
| 44 | default: | 44 | default: |
| 45 | err = -EINVAL; | 45 | err = -EINVAL; |
| 46 | goto error; | 46 | goto error; |
| 47 | }; | 47 | } |
| 48 | 48 | ||
| 49 | err = -EIO; | 49 | err = -EIO; |
| 50 | if (cfg_ret != PCIBIOS_SUCCESSFUL) | 50 | if (cfg_ret != PCIBIOS_SUCCESSFUL) |