Merge pull request #1058 from alistair23/alistair/master

psci_common: Resolve GCC static analysis false positive