The TPM chip on the ThinkPad T60 and Z60 machines is returning 0xFFFF
for the vendor ID which is a check the driver made to double check it
was actually talking to the memory mapped space of a TPM. This patch
removes the check since it isn't absolutely necessary and was causing
device discovery to fail on these machines.
This bug fix should go into 2.6.17.
Signed-off-by: Kylene Hall <[email protected]>
---
tpm_tis.c | 4 ----
1 files changed, 4 deletions(-)
--- linux-2.6.17-rc3/drivers/char/tpm/tpm_tis.c 2006-05-16 12:33:36.434356500 -0500
+++ linux-2.6.17-rc3-tpm/drivers/char/tpm/tpm_tis.c 2006-05-25 14:52:01.793058750 -0500
@@ -457,10 +457,6 @@ static int __devinit tpm_tis_pnp_init(st
}
vendor = ioread32(chip->vendor.iobase + TPM_DID_VID(0));
- if ((vendor & 0xFFFF) == 0xFFFF) {
- rc = -ENODEV;
- goto out_err;
- }
/* Default timeouts */
chip->vendor.timeout_a = msecs_to_jiffies(TIS_SHORT_TIMEOUT);