aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/power/suspend.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/power/suspend.c')
-rw-r--r--kernel/power/suspend.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index 87331565e505..9e13afe65a14 100644
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -556,7 +556,7 @@ static int enter_state(suspend_state_t state)
556 } else if (!valid_state(state)) { 556 } else if (!valid_state(state)) {
557 return -EINVAL; 557 return -EINVAL;
558 } 558 }
559 if (!mutex_trylock(&pm_mutex)) 559 if (!mutex_trylock(&system_transition_mutex))
560 return -EBUSY; 560 return -EBUSY;
561 561
562 if (state == PM_SUSPEND_TO_IDLE) 562 if (state == PM_SUSPEND_TO_IDLE)
@@ -590,7 +590,7 @@ static int enter_state(suspend_state_t state)
590 pm_pr_dbg("Finishing wakeup.\n"); 590 pm_pr_dbg("Finishing wakeup.\n");
591 suspend_finish(); 591 suspend_finish();
592 Unlock: 592 Unlock:
593 mutex_unlock(&pm_mutex); 593 mutex_unlock(&system_transition_mutex);
594 return error; 594 return error;
595} 595}
596 596