diff options
| author | David Brownell <david-b@pacbell.net> | 2006-08-14 23:11:05 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-09-25 21:08:37 -0700 |
| commit | b887d2e63c8857149ef59eb6e05adfaa018b8ebf (patch) | |
| tree | e3efb4b1c095fd2960c32d8f253679a045bf26db /drivers/pci | |
| parent | 82bb67f2c1f9ef438c56ac24e7dca027fe7289b5 (diff) | |
| download | kernel_samsung_tuna-b887d2e63c8857149ef59eb6e05adfaa018b8ebf.zip kernel_samsung_tuna-b887d2e63c8857149ef59eb6e05adfaa018b8ebf.tar.gz kernel_samsung_tuna-b887d2e63c8857149ef59eb6e05adfaa018b8ebf.tar.bz2 | |
PM: PCI and IDE handle PM_EVENT_PRETHAW
Convert some framework code to handle the new PRETHAW message.
- IDE just treats it like a FREEZE.
- The pci_choose_state() thingie still doesn't use PCI_D0 when it gets a
FREEZE (and now PRETHAW) event, which seems rather buglike but wasn't
something to change with this patch.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/pci.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 9f79dd6..8ab0278 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -432,10 +432,12 @@ pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state) case PM_EVENT_ON: return PCI_D0; case PM_EVENT_FREEZE: + case PM_EVENT_PRETHAW: + /* REVISIT both freeze and pre-thaw "should" use D0 */ case PM_EVENT_SUSPEND: return PCI_D3hot; default: - printk("They asked me for state %d\n", state.event); + printk("Unrecognized suspend event %d\n", state.event); BUG(); } return PCI_D0; |