aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/tpm/tpm.c
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2005-04-16 18:25:24 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-16 18:25:24 -0400
commit4fd416c14c583ee6ff1e2b17ab05e7e02e170e4c (patch)
tree4836046f082166b604e43eb3c6009682007ba5fe /drivers/char/tpm/tpm.c
parent438510f6f079e94df294936b5bd8a7fd679cd1c9 (diff)
[PATCH] Fix u32 vs. pm_message_t in drivers/char
Here are fixes for drivers/char. Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/tpm/tpm.c')
-rw-r--r--drivers/char/tpm/tpm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index 8318268169d6..ca36087d4f8a 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -567,7 +567,7 @@ static u8 savestate[] = {
567 * We are about to suspend. Save the TPM state 567 * We are about to suspend. Save the TPM state
568 * so that it can be restored. 568 * so that it can be restored.
569 */ 569 */
570int tpm_pm_suspend(struct pci_dev *pci_dev, u32 pm_state) 570int tpm_pm_suspend(struct pci_dev *pci_dev, pm_message_t pm_state)
571{ 571{
572 struct tpm_chip *chip = pci_get_drvdata(pci_dev); 572 struct tpm_chip *chip = pci_get_drvdata(pci_dev);
573 if (chip == NULL) 573 if (chip == NULL)