lkml.org 
[lkml]   [2006]   [May]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH] tpm: fix bug for TPM on ThinkPad T60 and Z60
From
Date
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 <kjhall@us.ibm.com>
---
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);


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2006-05-25 21:43    [W:0.029 / U:0.396 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site