2 files changed, 3 insertions, 2 deletions

diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 60b45e79f0..15c7c670da 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -562,7 +562,8 @@ pcibios_enable_device (struct pci_dev *dev, int mask)
 void
 pcibios_disable_device (struct pci_dev *dev)
 {
-        acpi_pci_irq_disable(dev);
+        if (dev->is_enabled)
+                acpi_pci_irq_disable(dev);
 }
 
 void
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index b604926401..723972bb5b 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -339,7 +339,7 @@ static void __init mpic_scan_ht_pic(struct mpic *mpic, u8 __iomem *devbase,
         for (pos = readb(devbase + PCI_CAPABILITY_LIST); pos != 0;
              pos = readb(devbase + pos + PCI_CAP_LIST_NEXT)) {
                 u8 id = readb(devbase + pos + PCI_CAP_LIST_ID);
-                if (id == PCI_CAP_ID_HT_IRQCONF) {
+                if (id == PCI_CAP_ID_HT) {
                         id = readb(devbase + pos + 3);
                         if (id == 0x80)
                                 break;