From 71f2e2b8e0ad95cb09b1cd95adf783e36d8cdba6 Mon Sep 17 00:00:00 2001
From: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Date: Mon, 17 Jan 2011 09:22:47 +0900
Subject: [PATCH] --- yaml --- r: 231956 b: refs/heads/master c:
 35576eab390df313095306e2a8216134910e7014 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/security/keys/trusted_defined.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 7f963e77fe52..01d2234664d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40c1001792de63e0f90e977eb05393fd71f78692
+refs/heads/master: 35576eab390df313095306e2a8216134910e7014
diff --git a/trunk/security/keys/trusted_defined.c b/trunk/security/keys/trusted_defined.c
index 932f8687df16..7b2179589063 100644
--- a/trunk/security/keys/trusted_defined.c
+++ b/trunk/security/keys/trusted_defined.c
@@ -101,11 +101,13 @@ static int TSS_rawhmac(unsigned char *digest, const unsigned char *key,
 		if (dlen == 0)
 			break;
 		data = va_arg(argp, unsigned char *);
-		if (data == NULL)
-			return -EINVAL;
+		if (data == NULL) {
+			ret = -EINVAL;
+			break;
+		}
 		ret = crypto_shash_update(&sdesc->shash, data, dlen);
 		if (ret < 0)
-			goto out;
+			break;
 	}
 	va_end(argp);
 	if (!ret)