3 files changed, 39 insertions, 37 deletions

diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index 17d2b07ee67c..e2501ac6fe84 100644
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@ -33,21 +33,15 @@ obj-$(CONFIG_PCI_IOV) += iov.o
 #
 # Some architectures use the generic PCI setup functions
 #
-obj-$(CONFIG_X86) += setup-bus.o
-obj-$(CONFIG_ALPHA) += setup-bus.o setup-irq.o
-obj-$(CONFIG_ARM) += setup-bus.o setup-irq.o
-obj-$(CONFIG_UNICORE32) += setup-bus.o setup-irq.o
-obj-$(CONFIG_PARISC) += setup-bus.o
-obj-$(CONFIG_SUPERH) += setup-bus.o setup-irq.o
-obj-$(CONFIG_PPC) += setup-bus.o
-obj-$(CONFIG_FRV) += setup-bus.o
-obj-$(CONFIG_MIPS) += setup-bus.o setup-irq.o
+obj-$(CONFIG_ALPHA) += setup-irq.o
+obj-$(CONFIG_ARM) += setup-irq.o
+obj-$(CONFIG_UNICORE32) += setup-irq.o
+obj-$(CONFIG_SUPERH) += setup-irq.o
+obj-$(CONFIG_MIPS) += setup-irq.o
 obj-$(CONFIG_X86_VISWS) += setup-irq.o
-obj-$(CONFIG_MN10300) += setup-bus.o
-obj-$(CONFIG_MICROBLAZE) += setup-bus.o
-obj-$(CONFIG_TILE) += setup-bus.o setup-irq.o
-obj-$(CONFIG_SPARC_LEON) += setup-bus.o setup-irq.o
-obj-$(CONFIG_M68K) += setup-bus.o setup-irq.o
+obj-$(CONFIG_TILE) += setup-irq.o
+obj-$(CONFIG_SPARC_LEON) += setup-irq.o
+obj-$(CONFIG_M68K) += setup-irq.o
 
 #
 # ACPI Related PCI FW Functions
diff --git a/drivers/pci/hotplug/cpqphp_core.c b/drivers/pci/hotplug/cpqphp_core.c
index 31273e155e6c..037e2612c5bd 100644
--- a/drivers/pci/hotplug/cpqphp_core.c
+++ b/drivers/pci/hotplug/cpqphp_core.c
@@ -920,12 +920,12 @@ static int cpqhpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                                 bus->max_bus_speed = PCI_SPEED_100MHz_PCIX;
                                 break;
                         }
-                        if (bus_cap & 20) {
+                        if (bus_cap & 0x20) {
                                 dbg("bus max supports 66MHz PCI-X\n");
                                 bus->max_bus_speed = PCI_SPEED_66MHz_PCIX;
                                 break;
                         }
-                        if (bus_cap & 10) {
+                        if (bus_cap & 0x10) {
                                 dbg("bus max supports 66MHz PCI\n");
                                 bus->max_bus_speed = PCI_SPEED_66MHz;
                                 break;
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index e4d45d27f288..b6ddde1d04ca 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1181,6 +1181,8 @@ EXPORT_SYMBOL_GPL(pci_load_and_free_saved_state);
 static int do_pci_enable_device(struct pci_dev *dev, int bars)
 {
         int err;
+        u16 cmd;
+        u8 pin;
 
         err = pci_set_power_state(dev, PCI_D0);
         if (err < 0 && err != -EIO)
@@ -1190,6 +1192,14 @@ static int do_pci_enable_device(struct pci_dev *dev, int bars)
                 return err;
         pci_fixup_device(pci_fixup_enable, dev);
 
+        pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
+        if (pin) {
+                pci_read_config_word(dev, PCI_COMMAND, &cmd);
+                if (cmd & PCI_COMMAND_INTX_DISABLE)
+                        pci_write_config_word(dev, PCI_COMMAND,
+                                              cmd & ~PCI_COMMAND_INTX_DISABLE);
+        }
+
         return 0;
 }
 
@@ -1611,29 +1621,27 @@ static void pci_pme_list_scan(struct work_struct *work)
         struct pci_pme_device *pme_dev, *n;
 
         mutex_lock(&pci_pme_list_mutex);
-        if (!list_empty(&pci_pme_list)) {
-                list_for_each_entry_safe(pme_dev, n, &pci_pme_list, list) {
-                        if (pme_dev->dev->pme_poll) {
-                                struct pci_dev *bridge;
-
-                                bridge = pme_dev->dev->bus->self;
-                                /*
-                                 * If bridge is in low power state, the
-                                 * configuration space of subordinate devices
-                                 * may be not accessible
-                                 */
-                                if (bridge && bridge->current_state != PCI_D0)
-                                        continue;
-                                pci_pme_wakeup(pme_dev->dev, NULL);
-                        } else {
-                                list_del(&pme_dev->list);
-                                kfree(pme_dev);
-                        }
+        list_for_each_entry_safe(pme_dev, n, &pci_pme_list, list) {
+                if (pme_dev->dev->pme_poll) {
+                        struct pci_dev *bridge;
+
+                        bridge = pme_dev->dev->bus->self;
+                        /*
+                         * If bridge is in low power state, the
+                         * configuration space of subordinate devices
+                         * may be not accessible
+                         */
+                        if (bridge && bridge->current_state != PCI_D0)
+                                continue;
+                        pci_pme_wakeup(pme_dev->dev, NULL);
+                } else {
+                        list_del(&pme_dev->list);
+                        kfree(pme_dev);
                 }
-                if (!list_empty(&pci_pme_list))
-                        schedule_delayed_work(&pci_pme_work,
-                                              msecs_to_jiffies(PME_TIMEOUT));
         }
+        if (!list_empty(&pci_pme_list))
+                schedule_delayed_work(&pci_pme_work,
+                                      msecs_to_jiffies(PME_TIMEOUT));
         mutex_unlock(&pci_pme_list_mutex);
 }