aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386
diff options
context:
space:
mode:
Diffstat (limited to 'arch/i386')
-rw-r--r--arch/i386/pci/direct.c6
-rw-r--r--arch/i386/pci/mmconfig.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/arch/i386/pci/direct.c b/arch/i386/pci/direct.c
index 0659ced01185..5d81fb510375 100644
--- a/arch/i386/pci/direct.c
+++ b/arch/i386/pci/direct.c
@@ -19,7 +19,7 @@ int pci_conf1_read(unsigned int seg, unsigned int bus,
19{ 19{
20 unsigned long flags; 20 unsigned long flags;
21 21
22 if (!value || (bus > 255) || (devfn > 255) || (reg > 255)) { 22 if ((bus > 255) || (devfn > 255) || (reg > 255)) {
23 *value = -1; 23 *value = -1;
24 return -EINVAL; 24 return -EINVAL;
25 } 25 }
@@ -94,8 +94,10 @@ static int pci_conf2_read(unsigned int seg, unsigned int bus,
94 unsigned long flags; 94 unsigned long flags;
95 int dev, fn; 95 int dev, fn;
96 96
97 if (!value || (bus > 255) || (devfn > 255) || (reg > 255)) 97 if ((bus > 255) || (devfn > 255) || (reg > 255)) {
98 *value = -1;
98 return -EINVAL; 99 return -EINVAL;
100 }
99 101
100 dev = PCI_SLOT(devfn); 102 dev = PCI_SLOT(devfn);
101 fn = PCI_FUNC(devfn); 103 fn = PCI_FUNC(devfn);
diff --git a/arch/i386/pci/mmconfig.c b/arch/i386/pci/mmconfig.c
index f77d7f8b9bf6..6b1ea0c9a570 100644
--- a/arch/i386/pci/mmconfig.c
+++ b/arch/i386/pci/mmconfig.c
@@ -80,7 +80,7 @@ static int pci_mmcfg_read(unsigned int seg, unsigned int bus,
80 unsigned long flags; 80 unsigned long flags;
81 u32 base; 81 u32 base;
82 82
83 if (!value || (bus > 255) || (devfn > 255) || (reg > 4095)) { 83 if ((bus > 255) || (devfn > 255) || (reg > 4095)) {
84 *value = -1; 84 *value = -1;
85 return -EINVAL; 85 return -EINVAL;
86 } 86 }