iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'drivers/psci2' into next/drivers

Browse Source 
* drivers/psci2:
  drivers: psci: make PSCI 1.0 functions initialization version dependent

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2015-10-23 09:57:16 -07:00
commit 056a72a559
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/firmware/psci.c
View File

@ -347,9 +347,10 @@ static int __init psci_probe(void)
psci_init_migrate();
psci_init_cpu_suspend();
psci_init_system_suspend();
if (PSCI_VERSION_MAJOR(ver) >= 1) {
psci_init_cpu_suspend();
psci_init_system_suspend();
}
return 0;
}