1 files changed, 9 insertions, 1 deletions

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index cb23aa2ebf96..a70fa89f76fd 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -212,6 +212,7 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)
 
         pdev = pci_get_slot(pbus, PCI_DEVFN(device, function));
         if (pdev) {
+                pdev->current_state = PCI_D0;
                 slot->flags |= (SLOT_ENABLED | SLOT_POWEREDON);
                 pci_dev_put(pdev);
         }
@@ -584,7 +585,7 @@ static void remove_bridge(acpi_handle handle)
 
         /*
          * On root bridges with hotplug slots directly underneath (ie,
-         * no p2p bridge inbetween), we call cleanup_bridge(). 
+         * no p2p bridge between), we call cleanup_bridge(). 
          *
          * The else clause cleans up root bridges that either had no
          * hotplug slots at all, or had a p2p bridge underneath.
@@ -826,6 +827,13 @@ static int __ref enable_device(struct acpiphp_slot *slot)
         acpiphp_set_hpp_values(bus);
         acpiphp_set_acpi_region(slot);
         pci_enable_bridges(bus);
+
+        list_for_each_entry(dev, &bus->devices, bus_list) {
+                /* Assume that newly added devices are powered on already. */
+                if (!dev->is_added)
+                        dev->current_state = PCI_D0;
+        }
+
         pci_bus_add_devices(bus);
 
         list_for_each_entry(func, &slot->funcs, sibling) {