diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-26 08:20:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-26 08:20:16 -0700 |
| commit | 58b164b50a6dba53c7b154f632c1f9d67832d3e4 (patch) | |
| tree | 75e60c80f57fc80f709d9cb24a3b435cd19943e5 /drivers | |
| parent | 20ba5efb9c788cb3308c8711757848cf0e596529 (diff) | |
| parent | 59f6fbe4291fcc078ba26ce4edf8373a7620a13a (diff) | |
| download | linux-58b164b50a6dba53c7b154f632c1f9d67832d3e4.tar.gz linux-58b164b50a6dba53c7b154f632c1f9d67832d3e4.tar.bz2 linux-58b164b50a6dba53c7b154f632c1f9d67832d3e4.zip | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/tpm/tpm_tis.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c index 24314a9cffe8..1030f8420137 100644 --- a/drivers/char/tpm/tpm_tis.c +++ b/drivers/char/tpm/tpm_tis.c @@ -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 = { |