From 58bc0924bbf6bdfc300b90fd81f0982c5de3797f Mon Sep 17 00:00:00 2001 From: Stefan Berger Date: Tue, 22 Jan 2013 13:50:07 -0600 Subject: [PATCH] --- yaml --- r: 352864 b: refs/heads/master c: 3e3a5e906998b090ad929010a5f5082ac0dbbdfb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/tpm/tpm.h | 2 ++ trunk/drivers/char/tpm/tpm_tis.c | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3182ef50c051..90a827ebb73c 100644 --- 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 index cbee6319be75..ef4ba5fcf7d9 100644 --- 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 index 74ce2d1f08b4..3615d210e603 100644 --- 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",