The patch titled
tpm: fix bug for TPM on ThinkPad T60 and Z60
has been added to the -mm tree. Its filename is
tpm-fix-bug-for-tpm-on-thinkpad-t60-and-z60.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: tpm: fix bug for TPM on ThinkPad T60 and Z60
From: Kylene Jo Hall <kjhall@xxxxxxxxxx>
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.
Signed-off-by: Kylene Hall <kjhall@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/char/tpm/tpm_tis.c | 4 ----
1 files changed, 4 deletions(-)
diff -puN drivers/char/tpm/tpm_tis.c~tpm-fix-bug-for-tpm-on-thinkpad-t60-and-z60 drivers/char/tpm/tpm_tis.c
--- 25/drivers/char/tpm/tpm_tis.c~tpm-fix-bug-for-tpm-on-thinkpad-t60-and-z60 Thu May 25 13:56:58 2006
+++ 25-akpm/drivers/char/tpm/tpm_tis.c Thu May 25 13:56:58 2006
@@ -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);
_
Patches currently in -mm which might be from kjhall@xxxxxxxxxx are
tpm-fix-bug-for-tpm-on-thinkpad-t60-and-z60.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
