diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-30 03:29:23 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-30 03:29:23 +0200 |
| commit | 88502b9c0a5dcc884c0dbfb6ddf964ff5da5d8d3 (patch) | |
| tree | f79f728c308100bc3e57d0d2f5d1e00d90406a0d /drivers/pci | |
| parent | driver-core: remove struct bus_type.drv_attrs (diff) | |
| parent | Linux 3.12-rc3 (diff) | |
| download | linux-88502b9c0a5dcc884c0dbfb6ddf964ff5da5d8d3.tar.xz linux-88502b9c0a5dcc884c0dbfb6ddf964ff5da5d8d3.zip | |
Merge 3.12-rc3 into driver-core-next
We want the driver core and sysfs fixes in here to make merges and
development easier.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/pci.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index e8ccf6c0f08a..bdd64b1b4817 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -1155,8 +1155,14 @@ static void pci_enable_bridge(struct pci_dev *dev) pci_enable_bridge(dev->bus->self); - if (pci_is_enabled(dev)) + if (pci_is_enabled(dev)) { + if (!dev->is_busmaster) { + dev_warn(&dev->dev, "driver skip pci_set_master, fix it!\n"); + pci_set_master(dev); + } return; + } + retval = pci_enable_device(dev); if (retval) dev_err(&dev->dev, "Error enabling bridge (%d), continuing\n", |