- tpm-fix-bug-for-tpm-on-thinkpad-t60-and-z60.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled

     tpm: fix bug for TPM on ThinkPad T60 and Z60

has been removed from the -mm tree.  Its filename is

     tpm-fix-bug-for-tpm-on-thinkpad-t60-and-z60.patch

This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.

------------------------------------------------------
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
--- devel/drivers/char/tpm/tpm_tis.c~tpm-fix-bug-for-tpm-on-thinkpad-t60-and-z60	2006-05-25 18:44:07.000000000 -0700
+++ devel-akpm/drivers/char/tpm/tpm_tis.c	2006-05-25 18:44:07.000000000 -0700
@@ -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

origin.patch
tpm-bios-log-parsing-fixes.patch
tpm-more-bios-log-parsing-fixes.patch
tpm-more-bios-log-parsing-fixes-tidy.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

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux