Decided to add Enric's commit because it is also a bug fix instead of modifying Chris commit.
Chris Chiu (1): tpm: self test failure should not cause suspend to fail
Enric Balletbo i Serra (1): tpm: do not suspend/resume if power stays on
drivers/char/tpm/tpm-interface.c | 7 +++++++ drivers/char/tpm/tpm.h | 1 + drivers/char/tpm/tpm_of.c | 3 +++ 3 files changed, 11 insertions(+)