From 0195967ca7cca4dd36f0f11f831fc75085fc0f93 Mon Sep 17 00:00:00 2001
From: Peter Huewe <huewe.external.infineon@googlemail.com>
Date: Tue, 29 Mar 2011 13:31:25 +0200
Subject: [PATCH] --- yaml --- r: 243263 b: refs/heads/master c:
 1309d7afbed112f0e8e90be9af975550caa0076b h: refs/heads/master i:   243261:
 c7167e7872212c13361e008b70114102d9b4e349   243259:
 f72f76de7ab02169954e5e7533121247788ac59f   243255:
 dd72aa627aedc9e1c1388f9a09e1ba1732fb7c44   243247:
 bbf7109cb7f5a241dea13b8ebcec1bca043a07f5   243231:
 37f9550e1aa8285951d43f91b31a9762043fd00c   243199:
 c9c8f67b8e1dce082cbcaa32b97f8bbaca99ec65 v: v3

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

diff --git a/[refs] b/[refs]
index fe6416747155..e72e7f92a1d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0444d76ae64fffc7851797fc1b6ebdbb44ac504a
+refs/heads/master: 1309d7afbed112f0e8e90be9af975550caa0076b
diff --git a/trunk/drivers/char/tpm/tpm.c b/trunk/drivers/char/tpm/tpm.c
index 1f46f1cd9225..7beb0e25f1e1 100644
--- a/trunk/drivers/char/tpm/tpm.c
+++ b/trunk/drivers/char/tpm/tpm.c
@@ -980,7 +980,7 @@ int tpm_open(struct inode *inode, struct file *file)
 		return -EBUSY;
 	}
 
-	chip->data_buffer = kmalloc(TPM_BUFSIZE * sizeof(u8), GFP_KERNEL);
+	chip->data_buffer = kzalloc(TPM_BUFSIZE, GFP_KERNEL);
 	if (chip->data_buffer == NULL) {
 		clear_bit(0, &chip->is_open);
 		put_device(chip->dev);