diff options
| author | Steve French <sfrench@us.ibm.com> | 2011-12-16 01:39:20 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2011-12-16 01:39:20 -0500 |
| commit | aaf015890754d58dcb71a4aa44ed246bb082bcf6 (patch) | |
| tree | 17b51ff707fd1b3efec3a3ab872f0d7a7416aca5 /security/keys/encrypted-keys/encrypted.c | |
| parent | 9c32c63bb70b2fafc3b18bee29959c3bf245ceba (diff) | |
| parent | 8def5f51b012efb00e77ba2d04696cc0aadd0609 (diff) | |
Merge branch 'master' of git+ssh://git.samba.org/data/git/sfrench/cifs-2.6
Diffstat (limited to 'security/keys/encrypted-keys/encrypted.c')
| -rw-r--r-- | security/keys/encrypted-keys/encrypted.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c index dcc843cb0f80..41144f71d615 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, | |||
| 444 | goto out; | 444 | goto out; |
| 445 | 445 | ||
| 446 | if (IS_ERR(mkey)) { | 446 | if (IS_ERR(mkey)) { |
| 447 | int ret = PTR_ERR(epayload); | 447 | int ret = PTR_ERR(mkey); |
| 448 | 448 | ||
| 449 | if (ret == -ENOTSUPP) | 449 | if (ret == -ENOTSUPP) |
| 450 | pr_info("encrypted_key: key %s not supported", | 450 | pr_info("encrypted_key: key %s not supported", |