Merge branch 'for-linus' of...

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  tpm_tis: fix subsequent suspend failures

parents 20ba5efb 59f6fbe4

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 = {