Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (28 commits)
  pciehp - fix wrong return value
  IA64: PCI: dont disable irq which is not enabled
  acpiphp: add support for ioapic hot-remove
  PCI: assign ioapic resource at hotplug
  acpiphp: disable bridges
  acpiphp: stop bus device before acpi_bus_trim
  PCI: add pci_stop_bus_device
  acpiphp: do not initialize existing ioapics
  acpiphp: initialize ioapics before starting devices
  acpiphp: set hpp values before starting devices
  PCI Hotplug: cleanup pcihp skeleton code.
  PCI: Restore PCI Express capability registers after PM event
  PCI: drivers/pci/hotplug/acpiphp_glue.c: make a function static
  PCI: Multiprobe sanitizer
  PCI: fix __must_check warnings
  PCI Hotplug: fix __must_check warnings
  SHPCHP: fix __must_check warnings
  PCI-Express AER implemetation: pcie_portdrv error handler
  PCI-Express AER implemetation: AER core and aerdriver
  PCI-Express AER implemetation: export pcie_port_bus_type
  ...

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
index 33d198768356..41290a106bd8 100644
--- a/drivers/pci/hotplug/pciehp_ctrl.c
+++ b/drivers/pci/hotplug/pciehp_ctrl.c
@@ -762,14 +762,14 @@ int pciehp_enable_slot(struct slot *p_slot)
         if (rc || !getstatus) {
                 info("%s: no adapter on slot(%x)\n", __FUNCTION__, p_slot->number);
                 mutex_unlock(&p_slot->ctrl->crit_sect);
-                return 1;
+                return -ENODEV;
         }
         if (MRL_SENS(p_slot->ctrl->ctrlcap)) {  
                 rc = p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
                 if (rc || getstatus) {
                         info("%s: latch open on slot(%x)\n", __FUNCTION__, p_slot->number);
                         mutex_unlock(&p_slot->ctrl->crit_sect);
-                        return 1;
+                        return -ENODEV;
                 }
         }
         
@@ -778,7 +778,7 @@ int pciehp_enable_slot(struct slot *p_slot)
                 if (rc || getstatus) {
                         info("%s: already enabled on slot(%x)\n", __FUNCTION__, p_slot->number);
                         mutex_unlock(&p_slot->ctrl->crit_sect);
-                        return 1;
+                        return -EINVAL;
                 }
         }
         mutex_unlock(&p_slot->ctrl->crit_sect);
@@ -813,7 +813,7 @@ int pciehp_disable_slot(struct slot *p_slot)
                 if (ret || !getstatus) {
                         info("%s: no adapter on slot(%x)\n", __FUNCTION__, p_slot->number);
                         mutex_unlock(&p_slot->ctrl->crit_sect);
-                        return 1;
+                        return -ENODEV;
                 }
         }
 
@@ -822,7 +822,7 @@ int pciehp_disable_slot(struct slot *p_slot)
                 if (ret || getstatus) {
                         info("%s: latch open on slot(%x)\n", __FUNCTION__, p_slot->number);
                         mutex_unlock(&p_slot->ctrl->crit_sect);
-                        return 1;
+                        return -ENODEV;
                 }
         }
 
@@ -831,7 +831,7 @@ int pciehp_disable_slot(struct slot *p_slot)
                 if (ret || !getstatus) {
                         info("%s: already disabled slot(%x)\n", __FUNCTION__, p_slot->number);
                         mutex_unlock(&p_slot->ctrl->crit_sect);
-                        return 1;
+                        return -EINVAL;
                 }
         }