From 8f6950e5f3a6d1d486de619071a9a76138d2b0a5 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jesper.juhl@gmail.com>
Date: Fri, 20 Jul 2007 00:31:48 -0700
Subject: [PATCH] --- yaml --- r: 61988 b: refs/heads/master c:
 178554ae75739e91dc4d7c3e42a3db95448cc5bf h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 4b41167851cc..d6db15d308cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22982a5687d8abf7bafe6d307585464f47089f18
+refs/heads/master: 178554ae75739e91dc4d7c3e42a3db95448cc5bf
diff --git a/trunk/drivers/char/tpm/tpm_bios.c b/trunk/drivers/char/tpm/tpm_bios.c
index 4eba32b23b29..4b26ce48189b 100644
--- a/trunk/drivers/char/tpm/tpm_bios.c
+++ b/trunk/drivers/char/tpm/tpm_bios.c
@@ -427,7 +427,7 @@ static int tpm_ascii_bios_measurements_open(struct inode *inode,
 		return -ENOMEM;
 
 	if ((err = read_log(log)))
-		return err;
+		goto out_free;
 
 	/* now register seq file */
 	err = seq_open(file, &tpm_ascii_b_measurments_seqops);
@@ -435,10 +435,15 @@ static int tpm_ascii_bios_measurements_open(struct inode *inode,
 		seq = file->private_data;
 		seq->private = log;
 	} else {
-		kfree(log->bios_event_log);
-		kfree(log);
+		goto out_free;
 	}
+
+out:
 	return err;
+out_free:
+	kfree(log->bios_event_log);
+	kfree(log);
+	goto out;
 }
 
 const struct file_operations tpm_ascii_bios_measurements_ops = {