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;