diff options
| author | Amit Daniel Kachhap <amit.daniel@samsung.com> | 2014-10-30 13:24:51 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2014-10-30 17:29:07 +0100 |
| commit | f4fd36b8802781238beb99015b40af4425f3dfa9 (patch) | |
| tree | 003b4cfe60e7adc334353fc51af841763dd85f4d /arch/arm64/kernel/psci.c | |
| parent | arm64: Fix memblock current_limit with 64K pages and 48-bit VA (diff) | |
| download | linux-f4fd36b8802781238beb99015b40af4425f3dfa9.tar.xz linux-f4fd36b8802781238beb99015b40af4425f3dfa9.zip | |
arm64: psci: fix cpu_suspend to check idle state type for index
This fix rectifies the psci cpu_suspend implementation to check the
PSCI power state parameter type field associated with the requested idle
state index.
Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/kernel/psci.c')
| -rw-r--r-- | arch/arm64/kernel/psci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c index 866c1c821860..663da771580a 100644 --- a/arch/arm64/kernel/psci.c +++ b/arch/arm64/kernel/psci.c @@ -528,7 +528,7 @@ static int __maybe_unused cpu_psci_cpu_suspend(unsigned long index) if (WARN_ON_ONCE(!index)) return -EINVAL; - if (state->type == PSCI_POWER_STATE_TYPE_STANDBY) + if (state[index - 1].type == PSCI_POWER_STATE_TYPE_STANDBY) ret = psci_ops.cpu_suspend(state[index - 1], 0); else ret = __cpu_suspend(index, psci_suspend_finisher); |