From 8feea9f86db443e2d8b3a8a2265ad0132ab7566c Mon Sep 17 00:00:00 2001
From: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
Date: Fri, 16 Sep 2011 14:34:37 -0300
Subject: [PATCH] --- yaml --- r: 283235 b: refs/heads/master c:
 9efa54f002cc03fdb4e9d8d508aa996af01c48d0 h: refs/heads/master i:   283233:
 a08158e07e928a77314a2b885367343ff85cf1c6   283231:
 a14856904a86cf301f38adbbbd77e88b9b2c2a9c v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/char/tpm/tpm_tis.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index b8c1222eaa94..2f7e5b636c09 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a927b8131794ee449b7f6666e7ab61301949b20f
+refs/heads/master: 9efa54f002cc03fdb4e9d8d508aa996af01c48d0
diff --git a/trunk/drivers/char/tpm/tpm_tis.c b/trunk/drivers/char/tpm/tpm_tis.c
index d93bafde3120..e4553eb6e542 100644
--- a/trunk/drivers/char/tpm/tpm_tis.c
+++ b/trunk/drivers/char/tpm/tpm_tis.c
@@ -201,7 +201,7 @@ static int wait_for_stat(struct tpm_chip *chip, u8 mask, unsigned long timeout,
 	u8 status;
 
 	/* check current status */
-	status = tpm_tis_status(chip);
+	status = chip->vendor.status(chip);
 	if ((status & mask) == mask)
 		return 0;
 
@@ -213,9 +213,9 @@ static int wait_for_stat(struct tpm_chip *chip, u8 mask, unsigned long timeout,
 		if ((long)timeout <= 0)
 			return -ETIME;
 		rc = wait_event_interruptible_timeout(*queue,
-						      ((tpm_tis_status
-							(chip) & mask) ==
-						       mask), timeout);
+						      ((chip->vendor.status(chip)
+						      & mask) == mask),
+						      timeout);
 		if (rc > 0)
 			return 0;
 		if (rc == -ERESTARTSYS && freezing(current)) {
@@ -225,7 +225,7 @@ static int wait_for_stat(struct tpm_chip *chip, u8 mask, unsigned long timeout,
 	} else {
 		do {
 			msleep(TPM_TIMEOUT);
-			status = tpm_tis_status(chip);
+			status = chip->vendor.status(chip);
 			if ((status & mask) == mask)
 				return 0;
 		} while (time_before(jiffies, stop));