Commit 087377a4 authored May 25, 2006 by Kylene Jo Hall Committed by Linus Torvalds May 26, 2006

[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>

parent 5d5daa16

drivers/char/tpm/tpm_tis.c

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -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));		vendor = ioread32(chip->vendor.iobase + TPM_DID_VID(0));
	if ((vendor & 0xFFFF) == 0xFFFF) {
	rc = -ENODEV;
	goto out_err;
	}

	/* Default timeouts */		/* Default timeouts */
	chip->vendor.timeout_a = msecs_to_jiffies(TIS_SHORT_TIMEOUT);		chip->vendor.timeout_a = msecs_to_jiffies(TIS_SHORT_TIMEOUT);