Merge branch 'for-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...

[~andy/linux] / drivers / misc / cb710 / core.c

diff --git a/drivers/misc/cb710/core.c b/drivers/misc/cb710/core.c
index 85cc7710193c7bfe224bfa08f3a8b1df8f66295f..9d5eed754666d907b566a7e44264c118c3402dd7 100644 (file)
--- a/drivers/misc/cb710/core.c
+++ b/drivers/misc/cb710/core.c
@@ -180,7 +180,7 @@ static int cb710_suspend(struct pci_dev *pdev, pm_message_t state)
        pci_save_state(pdev);
        pci_disable_device(pdev);
        if (state.event & PM_EVENT_SLEEP)
-               pci_set_power_state(pdev, PCI_D3cold);
+               pci_set_power_state(pdev, PCI_D3hot);
        return 0;
 }