---

yaml --- r: 283235 b: refs/heads/master c: 9efa54f h: refs/heads/master i: 283233: a08158e 283231: a148569 v: v3
git-mirror · Nov 16, 2011 · 8feea9f · 8feea9f
1 parent dfd3ef5
commit 8feea9f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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));