diff options
Diffstat (limited to 'drivers/macintosh/mediabay.c')
-rw-r--r-- | drivers/macintosh/mediabay.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c index 7e1afca75e41..c0712a1ea5af 100644 --- a/drivers/macintosh/mediabay.c +++ b/drivers/macintosh/mediabay.c | |||
@@ -708,7 +708,7 @@ static int __pmac media_bay_suspend(struct macio_dev *mdev, pm_message_t state) | |||
708 | { | 708 | { |
709 | struct media_bay_info *bay = macio_get_drvdata(mdev); | 709 | struct media_bay_info *bay = macio_get_drvdata(mdev); |
710 | 710 | ||
711 | if (state != mdev->ofdev.dev.power.power_state && state == PM_SUSPEND_MEM) { | 711 | if (state.event != mdev->ofdev.dev.power.power_state.event && state.event == PM_EVENT_SUSPEND) { |
712 | down(&bay->lock); | 712 | down(&bay->lock); |
713 | bay->sleeping = 1; | 713 | bay->sleeping = 1; |
714 | set_mb_power(bay, 0); | 714 | set_mb_power(bay, 0); |
@@ -723,7 +723,7 @@ static int __pmac media_bay_resume(struct macio_dev *mdev) | |||
723 | { | 723 | { |
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.event != PM_EVENT_ON) { |
727 | mdev->ofdev.dev.power.power_state = PMSG_ON; | 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 |