---

yaml --- r: 352864 b: refs/heads/master c: 3e3a5e9 h: refs/heads/master v: v3
git-mirror · Feb 5, 2013 · 58bc092 · 58bc092
1 parent 2c31b4d
commit 58bc092
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4643826a3da17767494b85c956c73c138c96a7ea
+refs/heads/master: 3e3a5e906998b090ad929010a5f5082ac0dbbdfb
diff --git a/trunk/drivers/char/tpm/tpm.h b/trunk/drivers/char/tpm/tpm.h
@@ -105,6 +105,8 @@ struct tpm_vendor_specific {
 
 	wait_queue_head_t read_queue;
 	wait_queue_head_t int_queue;
+
+	u16 manufacturer_id;
 };
 
 #define TPM_VPRIV(c)	(c)->vendor.priv

diff --git a/trunk/drivers/char/tpm/tpm_tis.c b/trunk/drivers/char/tpm/tpm_tis.c
@@ -534,6 +534,7 @@ static int tpm_tis_init(struct device *dev, resource_size_t start,
 	}
 
 	vendor = ioread32(chip->vendor.iobase + TPM_DID_VID(0));
+	chip->vendor.manufacturer_id = vendor;
 
 	dev_info(dev,
 		 "1.2 TPM (device-id 0x%X, rev-id %d)\n",