git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
[pandora-kernel.git]
/
security
/
keys
/
encrypted-keys
/
encrypted.c
diff --git
a/security/keys/encrypted-keys/encrypted.c
b/security/keys/encrypted-keys/encrypted.c
index
dcc843c
..
41144f7
100644
(file)
--- 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",