diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/cpuidle/governors/ladder.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/cpuidle/governors/ladder.c')
| -rw-r--r-- | drivers/cpuidle/governors/ladder.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/cpuidle/governors/ladder.c b/drivers/cpuidle/governors/ladder.c index a4bec3f919aa..1c1ceb4f218f 100644 --- a/drivers/cpuidle/governors/ladder.c +++ b/drivers/cpuidle/governors/ladder.c | |||
| @@ -69,9 +69,6 @@ static int ladder_select_state(struct cpuidle_device *dev) | |||
| 69 | int last_residency, last_idx = ldev->last_state_idx; | 69 | int last_residency, last_idx = ldev->last_state_idx; |
| 70 | int latency_req = pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY); | 70 | int latency_req = pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY); |
| 71 | 71 | ||
| 72 | if (unlikely(!ldev)) | ||
| 73 | return 0; | ||
| 74 | |||
| 75 | /* Special case when user has set very strict latency requirement */ | 72 | /* Special case when user has set very strict latency requirement */ |
| 76 | if (unlikely(latency_req == 0)) { | 73 | if (unlikely(latency_req == 0)) { |
| 77 | ladder_do_selection(ldev, last_idx, 0); | 74 | ladder_do_selection(ldev, last_idx, 0); |