diff options
| author | Pavel Machek <pavel@ucw.cz> | 2005-09-03 18:56:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:06:15 -0400 |
| commit | 829ca9a30a2ddb727981d80fabdbff2ea86bc9ea (patch) | |
| tree | 044087fb18aa4b5f5bbd233f54f9eec3439ad6de /drivers/macintosh | |
| parent | 7e958883bced7e435f5a76349e15684858d3477c (diff) | |
[PATCH] swsusp: fix remaining u32 vs. pm_message_t confusion
Fix remaining bits of u32 vs. pm_message confusion. Should not break
anything.
Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/macintosh')
| -rw-r--r-- | drivers/macintosh/mediabay.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c index 7c16c25fc5d4..7e1afca75e41 100644 --- a/drivers/macintosh/mediabay.c +++ b/drivers/macintosh/mediabay.c | |||
| @@ -724,7 +724,7 @@ static int __pmac media_bay_resume(struct macio_dev *mdev) | |||
| 724 | struct media_bay_info *bay = macio_get_drvdata(mdev); | 724 | struct media_bay_info *bay = macio_get_drvdata(mdev); |
| 725 | 725 | ||
| 726 | if (mdev->ofdev.dev.power.power_state != 0) { | 726 | if (mdev->ofdev.dev.power.power_state != 0) { |
| 727 | mdev->ofdev.dev.power.power_state = 0; | 727 | mdev->ofdev.dev.power.power_state = PMSG_ON; |
| 728 | 728 | ||
| 729 | /* We re-enable the bay using it's previous content | 729 | /* We re-enable the bay using it's previous content |
| 730 | only if it did not change. Note those bozo timings, | 730 | only if it did not change. Note those bozo timings, |