aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/tpm
diff options
context:
space:
mode:
authorKylene Jo Hall <kjhall@us.ibm.com>2006-05-25 18:44:27 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-26 11:55:47 -0700
commit087377a4307e18225f6452af5e71fe763c088c4e (patch)
treecd8ea73ad5ba8ba80f92f17f747628fdddb236f0 /drivers/char/tpm
parent5d5daa162a5187bc0f98eb2bc7a063392b0de311 (diff)
downloadkernel_samsung_espresso10-087377a4307e18225f6452af5e71fe763c088c4e.zip
kernel_samsung_espresso10-087377a4307e18225f6452af5e71fe763c088c4e.tar.gz
kernel_samsung_espresso10-087377a4307e18225f6452af5e71fe763c088c4e.tar.bz2
[PATCH] 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. Signed-off-by: Kylene Hall <kjhall@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/tpm')
-rw-r--r--drivers/char/tpm/tpm_tis.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index f621168..8ea7062 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -457,10 +457,6 @@ static int __devinit tpm_tis_pnp_init(struct pnp_dev *pnp_dev,
}
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);