Merge branches 'pci/enumeration', 'pci/virtualization' and 'pci/cleanup' into next

[uclinux-h8/linux.git] / drivers / pci / pci.c

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 8b63a5b..b7678be 100644 (file)
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1914,10 +1914,6 @@ int pci_prepare_to_sleep(struct pci_dev *dev)
        if (target_state == PCI_POWER_ERROR)
                return -EIO;
 
-       /* D3cold during system suspend/hibernate is not supported */
-       if (target_state > PCI_D3hot)
-               target_state = PCI_D3hot;
-
        pci_enable_wake(dev, target_state, device_may_wakeup(&dev->dev));
 
        error = pci_set_power_state(dev, target_state);