diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-15 11:39:22 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-15 11:39:22 +1000 |
| commit | 1fe587bd44e04b644f734c64d00d355d3826b6a4 (patch) | |
| tree | 7a1281f824e1474e8849788d531afdf95cbefe8d /drivers | |
| parent | 98124703c2427751e8ad21b71ec7ae5a9e59d752 (diff) | |
| parent | 4a8ece22b1e2309a76b8af0787b636dee5e85209 (diff) | |
Merge remote branch 'security-testing/next'
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 = { |