From: Mimi Zohar <zohar@linux.vnet.ibm.com>
Date: Mon, 24 Oct 2011 12:17:42 +0000 (-0400)
Subject: encrypted-keys: fix error return code
X-Git-Tag: v3.2-rc3~42^2^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f4a0d5abef14562c37dee5a1d49180f494106230;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

encrypted-keys: fix error return code

Fix request_master_key() error return code.

Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
---

diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c
index dcc843c..41144f7 100644
--- a/security/keys/encrypted-keys/encrypted.c
+++ b/security/keys/encrypted-keys/encrypted.c
@@ -444,7 +444,7 @@ static struct key *request_master_key(struct encrypted_key_payload *epayload,
 		goto out;
 
 	if (IS_ERR(mkey)) {
-		int ret = PTR_ERR(epayload);
+		int ret = PTR_ERR(mkey);
 
 		if (ret == -ENOTSUPP)
 			pr_info("encrypted_key: key %s not supported",