projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] USB: ub 4: Zaitcev's quasi-S/G
[powerpc.git]
/
drivers
/
macintosh
/
mediabay.c
diff --git
a/drivers/macintosh/mediabay.c
b/drivers/macintosh/mediabay.c
index
7c16c25
..
c0712a1
100644
(file)
--- 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)
{
struct media_bay_info *bay = macio_get_drvdata(mdev);
{
struct media_bay_info *bay = macio_get_drvdata(mdev);
- if (state
!= mdev->ofdev.dev.power.power_state && state == PM_SUSPEND_MEM
) {
+ if (state
.event != mdev->ofdev.dev.power.power_state.event && state.event == PM_EVENT_SUSPEND
) {
down(&bay->lock);
bay->sleeping = 1;
set_mb_power(bay, 0);
down(&bay->lock);
bay->sleeping = 1;
set_mb_power(bay, 0);
@@
-723,8
+723,8
@@
static int __pmac media_bay_resume(struct macio_dev *mdev)
{
struct media_bay_info *bay = macio_get_drvdata(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
;
+ if (mdev->ofdev.dev.power.power_state
.event != PM_EVENT_ON
) {
+ 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,
/* We re-enable the bay using it's previous content
only if it did not change. Note those bozo timings,