From 1317b206587f8eebc6cdcbad4c501e63951f6075 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Tue, 11 Apr 2006 12:54:48 +0200
Subject: [PATCH] --- yaml --- r: 25623 b: refs/heads/master c:
 ecc16ba96fd5b1a1c1988f0a2b05ff954bdff728 h: refs/heads/master i:   25621:
 deb30d4b7c144e1a1fc8be4172042af9630716f3   25619:
 6ffa75c2f5baf4a0ed7540162c1484ce194b61bd   25615:
 fe86f0fdfce0fe7e2de127e8310d3f75f3be95fa v: v3

---
 [refs]                           | 2 +-
 trunk/arch/i386/pci/direct.c     | 6 ++++--
 trunk/arch/i386/pci/mmconfig.c   | 2 +-
 trunk/arch/x86_64/pci/mmconfig.c | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 55c101ec0b11..262d46ed6798 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d8a4d795cc1ffa6be5371629ca6c3431af4c2d5
+refs/heads/master: ecc16ba96fd5b1a1c1988f0a2b05ff954bdff728
diff --git a/trunk/arch/i386/pci/direct.c b/trunk/arch/i386/pci/direct.c
index 0659ced01185..5d81fb510375 100644
--- a/trunk/arch/i386/pci/direct.c
+++ b/trunk/arch/i386/pci/direct.c
@@ -19,7 +19,7 @@ int pci_conf1_read(unsigned int seg, unsigned int bus,
 {
 	unsigned long flags;
 
-	if (!value || (bus > 255) || (devfn > 255) || (reg > 255)) {
+	if ((bus > 255) || (devfn > 255) || (reg > 255)) {
 		*value = -1;
 		return -EINVAL;
 	}
@@ -94,8 +94,10 @@ static int pci_conf2_read(unsigned int seg, unsigned int bus,
 	unsigned long flags;
 	int dev, fn;
 
-	if (!value || (bus > 255) || (devfn > 255) || (reg > 255))
+	if ((bus > 255) || (devfn > 255) || (reg > 255)) {
+		*value = -1;
 		return -EINVAL;
+	}
 
 	dev = PCI_SLOT(devfn);
 	fn = PCI_FUNC(devfn);
diff --git a/trunk/arch/i386/pci/mmconfig.c b/trunk/arch/i386/pci/mmconfig.c
index f77d7f8b9bf6..6b1ea0c9a570 100644
--- a/trunk/arch/i386/pci/mmconfig.c
+++ b/trunk/arch/i386/pci/mmconfig.c
@@ -80,7 +80,7 @@ static int pci_mmcfg_read(unsigned int seg, unsigned int bus,
 	unsigned long flags;
 	u32 base;
 
-	if (!value || (bus > 255) || (devfn > 255) || (reg > 4095)) {
+	if ((bus > 255) || (devfn > 255) || (reg > 4095)) {
 		*value = -1;
 		return -EINVAL;
 	}
diff --git a/trunk/arch/x86_64/pci/mmconfig.c b/trunk/arch/x86_64/pci/mmconfig.c
index b493ed977e7c..1a59a31bb740 100644
--- a/trunk/arch/x86_64/pci/mmconfig.c
+++ b/trunk/arch/x86_64/pci/mmconfig.c
@@ -75,7 +75,7 @@ static int pci_mmcfg_read(unsigned int seg, unsigned int bus,
 	char __iomem *addr;
 
 	/* Why do we have this when nobody checks it. How about a BUG()!? -AK */
-	if (unlikely(!value || (bus > 255) || (devfn > 255) || (reg > 4095))) {
+	if (unlikely((bus > 255) || (devfn > 255) || (reg > 4095))) {
 		*value = -1;
 		return -EINVAL;
 	}