From e4edcb061564878ea1967d32609f58600a868e13 Mon Sep 17 00:00:00 2001
From: Peter Huewe <peterhuewe@gmx.de>
Date: Tue, 29 Jan 2013 22:02:01 +0100
Subject: [PATCH] --- yaml --- r: 352871 b: refs/heads/master c:
 07d721688b8464662393f3b3136defbbad52be75 h: refs/heads/master i:   352869:
 be55ff426143d29474e5e57c09efea71eeebf6d7   352867:
 52b0d6d8ba79dc0a3927601c9e1db2240ead02a8   352863:
 2c31b4d6ca6723b6682cf0b2fa1752cb628a305c v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/char/tpm/tpm_i2c_stm_st33.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 11376454da46..b80144ac3dfd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e02983cffc5e65069edee9892672e0aef9d9e2cd
+refs/heads/master: 07d721688b8464662393f3b3136defbbad52be75
diff --git a/trunk/drivers/char/tpm/tpm_i2c_stm_st33.c b/trunk/drivers/char/tpm/tpm_i2c_stm_st33.c
index e3d1887e5be4..b14c4b59958d 100644
--- a/trunk/drivers/char/tpm/tpm_i2c_stm_st33.c
+++ b/trunk/drivers/char/tpm/tpm_i2c_stm_st33.c
@@ -642,8 +642,6 @@ tpm_st33_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id)
 	struct tpm_chip *chip;
 	struct st33zp24_platform_data *platform_data;
 
-	err = 0;
-
 	if (client == NULL) {
 		pr_info("%s: i2c client is NULL. Device not accessible.\n",
 			__func__);