Skip to content

Commit

Permalink
[PATCH] tpm: check mem start and len
Browse files Browse the repository at this point in the history
The memory start and length values obtained from the ACPI entry need to be
checked and filled in with the default values from the specification if
they don't exist.  This patch fills in the default values and uses them
appropriately.

Signed-off-by: Kylie Hall <kjhall@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Kylene Jo Hall authored and Linus Torvalds committed Apr 22, 2006
1 parent e496f54 commit b09d530
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions drivers/char/tpm/tpm_tis.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ enum tis_int_flags {
};

enum tis_defaults {
TIS_MEM_BASE = 0xFED4000,
TIS_MEM_LEN = 0x5000,
TIS_SHORT_TIMEOUT = 750, /* ms */
TIS_LONG_TIMEOUT = 2000, /* 2 sec */
};
Expand Down Expand Up @@ -437,6 +439,11 @@ static int __devinit tpm_tis_pnp_init(struct pnp_dev
start = pnp_mem_start(pnp_dev, 0);
len = pnp_mem_len(pnp_dev, 0);

if (!start)
start = TIS_MEM_BASE;
if (!len)
len = TIS_MEM_LEN;

if (!(chip = tpm_register_hardware(&pnp_dev->dev, &tpm_tis)))
return -ENODEV;

Expand Down

0 comments on commit b09d530

Please sign in to comment.