From 0aaaa71c8654c7b8ea49a2bb78728fb06b333dd7 Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 20 Jun 2012 16:41:16 -0600
Subject: [PATCH] --- yaml --- r: 316495 b: refs/heads/master c:
 809a3bf9f34cb6d0c0383b31b3495fa1ed3508a6 h: refs/heads/master i:   316493:
 681ea5750b0553d297dd105bff058483dd46ef97   316491:
 680569b8440950d8c8428fc81b25c983021bc678   316487:
 1b2ec691507c3f452679cb64a1e8a6598ec09486   316479:
 b7a6977e1d29e484f74c073bc56ffcf7e27ee5db v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/pci/pci.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1db594207d07..a941d4f1839e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dfb117b3e50c52c7b3416db4a4569224b8db80bb
+refs/heads/master: 809a3bf9f34cb6d0c0383b31b3495fa1ed3508a6
diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c
index b9e93cf1eb40..7f1310e58534 100644
--- a/trunk/drivers/pci/pci.c
+++ b/trunk/drivers/pci/pci.c
@@ -3395,8 +3395,7 @@ int pcix_set_mmrbc(struct pci_dev *dev, int mmrbc)
 
 	o = (cmd & PCI_X_CMD_MAX_READ) >> 2;
 	if (o != v) {
-		if (v > o && dev->bus &&
-		   (dev->bus->bus_flags & PCI_BUS_FLAGS_NO_MMRBC))
+		if (v > o && (dev->bus->bus_flags & PCI_BUS_FLAGS_NO_MMRBC))
 			return -EIO;
 
 		cmd &= ~PCI_X_CMD_MAX_READ;