projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
[firefly-linux-kernel-4.4.55.git]
/
arch
/
x86
/
pci
/
pcbios.c
diff --git
a/arch/x86/pci/pcbios.c
b/arch/x86/pci/pcbios.c
index a5f7d0d63de0def1481382f785d0fc34d553f0f6..f68553551467a0cbe6dd11a2cba04c6afaff5172 100644
(file)
--- a/
arch/x86/pci/pcbios.c
+++ b/
arch/x86/pci/pcbios.c
@@
-181,6
+181,7
@@
static int pci_bios_read(unsigned int seg, unsigned int bus,
unsigned long flags;
unsigned long bx = (bus << 8) | devfn;
unsigned long flags;
unsigned long bx = (bus << 8) | devfn;
+ WARN_ON(seg);
if (!value || (bus > 255) || (devfn > 255) || (reg > 255))
return -EINVAL;
if (!value || (bus > 255) || (devfn > 255) || (reg > 255))
return -EINVAL;
@@
-247,6
+248,7
@@
static int pci_bios_write(unsigned int seg, unsigned int bus,
unsigned long flags;
unsigned long bx = (bus << 8) | devfn;
unsigned long flags;
unsigned long bx = (bus << 8) | devfn;
+ WARN_ON(seg);
if ((bus > 255) || (devfn > 255) || (reg > 255))
return -EINVAL;
if ((bus > 255) || (devfn > 255) || (reg > 255))
return -EINVAL;