Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / pci / bus.c

diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index 628ea20a884190afbbffff2f80e0faf5cbaade1b..7f0af0e9b826dafa2e64d8302c130ea87e5af00b 100644 (file)
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
@@ -56,7 +56,7 @@ void pci_bus_remove_resources(struct pci_bus *bus)
        int i;
 
        for (i = 0; i < PCI_BRIDGE_RESOURCE_NUM; i++)
-               bus->resource[i] = 0;
+               bus->resource[i] = NULL;
 
        list_for_each_entry_safe(bus_res, tmp, &bus->resources, list) {
                list_del(&bus_res->list);
@@ -240,6 +240,8 @@ void pci_enable_bridges(struct pci_bus *bus)
                if (dev->subordinate) {
                        if (!pci_is_enabled(dev)) {
                                retval = pci_enable_device(dev);
+                               if (retval)
+                                       dev_err(&dev->dev, "Error enabling bridge (%d), continuing\n", retval);
                                pci_set_master(dev);
                        }
                        pci_enable_bridges(dev->subordinate);