Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59f6fbe4 authored by Rajiv Andrade's avatar Rajiv Andrade Committed by James Morris
Browse files

tpm_tis: fix subsequent suspend failures 

Fix subsequent suspends by issuing tpm_continue_selftest during resume.
Otherwise, the tpm chip seems to be not fully initialized and will reject
the save state command during suspend, thus preventing the whole system
to suspend.

Addresses https://bugzilla.kernel.org/show_bug.cgi?id=16256



Signed-off-by: default avatarHelmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: default avatarRajiv Andrade <srajiv@linux.vnet.ibm.com>
Cc: James Morris <jmorris@namei.org>
Cc: Debora Velarde <debora@linux.vnet.ibm.com>
Cc: David Safford <safford@watson.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent 86c65a78

drivers/char/tpm/tpm_tis.c

+8 −1
Original line number Diff line number Diff line
@@ -623,7 +623,14 @@ static int tpm_tis_pnp_suspend(struct pnp_dev *dev, pm_message_t msg) 


static int tpm_tis_pnp_resume(struct pnp_dev *dev)

{

	return tpm_pm_resume(&dev->dev);

	struct tpm_chip *chip = pnp_get_drvdata(dev);

	int ret;



	ret = tpm_pm_resume(&dev->dev);

	if (!ret)

		tpm_continue_selftest(chip);



	return ret;

}



static struct pnp_device_id tpm_pnp_tbl[] __devinitdata = {