Skip to contentSkip to conversation

tpm: fix bug for TPM on ThinkPad T60 and Z60

PATCH New Kylene Jo Hall 1 participant 1 message May 25, 2006 TPM device driver

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tpm: fix bug for TPM on ThinkPad T60 and Z60

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.

---

 tpm_tis.c |    4 ----
 1 files changed, 4 deletions(-)
drivers/char/tpm/tpm_tis.c +0 -4
@@ -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);