From 9ed7a8b7ef98bd01223be1e0b852af2727c60c74 Mon Sep 17 00:00:00 2001
From: Mimi Zohar <zohar@linux.vnet.ibm.com>
Date: Tue, 23 Nov 2010 17:50:32 -0500
Subject: [PATCH] --- yaml --- r: 227785 b: refs/heads/master c:
 a0e39349d80d8b5deeb264fb190bd064f7063252 h: refs/heads/master i:   227783:
 69ff118409b8dcf3bea3637a0b423852ad36831a v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/char/tpm/tpm.c | 4 ++--
 trunk/drivers/char/tpm/tpm.h | 5 +++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ebfc25a0d791..c4356a1d45f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc88e46029486ed475c71fe1bb696d39511ac8fe
+refs/heads/master: a0e39349d80d8b5deeb264fb190bd064f7063252
diff --git a/trunk/drivers/char/tpm/tpm.c b/trunk/drivers/char/tpm/tpm.c
index 7c4133582dba..26c09f3b4a74 100644
--- a/trunk/drivers/char/tpm/tpm.c
+++ b/trunk/drivers/char/tpm/tpm.c
@@ -736,7 +736,7 @@ int tpm_pcr_read(u32 chip_num, int pcr_idx, u8 *res_buf)
 	if (chip == NULL)
 		return -ENODEV;
 	rc = __tpm_pcr_read(chip, pcr_idx, res_buf);
-	module_put(chip->dev->driver->owner);
+	tpm_chip_put(chip);
 	return rc;
 }
 EXPORT_SYMBOL_GPL(tpm_pcr_read);
@@ -775,7 +775,7 @@ int tpm_pcr_extend(u32 chip_num, int pcr_idx, const u8 *hash)
 	rc = transmit_cmd(chip, &cmd, EXTEND_PCR_RESULT_SIZE,
 			  "attempting extend a PCR value");
 
-	module_put(chip->dev->driver->owner);
+	tpm_chip_put(chip);
 	return rc;
 }
 EXPORT_SYMBOL_GPL(tpm_pcr_extend);
diff --git a/trunk/drivers/char/tpm/tpm.h b/trunk/drivers/char/tpm/tpm.h
index 792868d24f2a..72ddb031b69a 100644
--- a/trunk/drivers/char/tpm/tpm.h
+++ b/trunk/drivers/char/tpm/tpm.h
@@ -113,6 +113,11 @@ struct tpm_chip {
 
 #define to_tpm_chip(n) container_of(n, struct tpm_chip, vendor)
 
+static inline void tpm_chip_put(struct tpm_chip *chip)
+{
+	module_put(chip->dev->driver->owner);
+}
+
 static inline int tpm_read_index(int base, int index)
 {
 	outb(index, base);