summaryrefslogtreecommitdiffstats
path: root/drivers/macintosh/mediabay.c
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2005-09-03 15:56:56 -0700
committerLinus Torvalds <torvalds@evo.osdl.org>2005-09-05 00:06:15 -0700
commit829ca9a30a2ddb727981d80fabdbff2ea86bc9ea (patch)
tree044087fb18aa4b5f5bbd233f54f9eec3439ad6de /drivers/macintosh/mediabay.c
parent7e958883bced7e435f5a76349e15684858d3477c (diff)
downloadop-kernel-dev-829ca9a30a2ddb727981d80fabdbff2ea86bc9ea.zip
op-kernel-dev-829ca9a30a2ddb727981d80fabdbff2ea86bc9ea.tar.gz
[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/mediabay.c')
-rw-r--r--drivers/macintosh/mediabay.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c
index 7c16c25..7e1afca 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)
struct media_bay_info *bay = macio_get_drvdata(mdev);
if (mdev->ofdev.dev.power.power_state != 0) {
- mdev->ofdev.dev.power.power_state = 0;
+ mdev->ofdev.dev.power.power_state = PMSG_ON;
/* We re-enable the bay using it's previous content
only if it did not change. Note those bozo timings,
OpenPOWER on IntegriCloud