---

yaml --- r: 316495 b: refs/heads/master c: 809a3bf h: refs/heads/master i: 316493: 681ea57 316491: 680569b 316487: 1b2ec69 316479: b7a6977 v: v3
git-mirror · Jun 20, 2012 · 0aaaa71 · 0aaaa71
1 parent 089a6b8
commit 0aaaa71
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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;