From a08158e07e928a77314a2b885367343ff85cf1c6 Mon Sep 17 00:00:00 2001
From: Stefan Berger <stefanb@linux.vnet.ibm.com>
Date: Fri, 11 Nov 2011 12:57:05 -0500
Subject: [PATCH] --- yaml --- r: 283233 b: refs/heads/master c:
 7f326ed7ff221a109bf89288bf6c8f0142e3e75c h: refs/heads/master i:   283231:
 a14856904a86cf301f38adbbbd77e88b9b2c2a9c v: v3

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

diff --git a/[refs] b/[refs]
index 1dc842f155a8..0dabf60c91ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68d6e6713fcb2ea6278661aaaf5f1c9c821b3751
+refs/heads/master: 7f326ed7ff221a109bf89288bf6c8f0142e3e75c
diff --git a/trunk/drivers/char/tpm/tpm_tis.c b/trunk/drivers/char/tpm/tpm_tis.c
index d30d5c3c6c02..34832bc74649 100644
--- a/trunk/drivers/char/tpm/tpm_tis.c
+++ b/trunk/drivers/char/tpm/tpm_tis.c
@@ -614,7 +614,11 @@ static int tpm_tis_init(struct device *dev, resource_size_t start,
 		dev_dbg(dev, "\tData Avail Int Support\n");
 
 	/* get the timeouts before testing for irqs */
-	tpm_get_timeouts(chip);
+	if (tpm_get_timeouts(chip)) {
+		dev_err(dev, "Could not get TPM timeouts and durations\n");
+		rc = -ENODEV;
+		goto out_err;
+	}
 
 	if (tpm_do_selftest(chip)) {
 		dev_err(dev, "TPM self test failed\n");