diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-02-23 07:36:46 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-02-23 07:36:46 +0100 |
| commit | fb86780bf7708cd6553f592a6318f10eda766127 (patch) | |
| tree | b59737c56a407c9f82166576209ef8e8cd09ecc6 /fs/cifs/cifsencrypt.c | |
| parent | 8f8e2aec9944dd12671182a1a26b8e1a35872a1d (diff) | |
| parent | dd71a17b1193dd4a4c35ecd0ba227aac3d110836 (diff) | |
Merge branch 'x86/urgent' into x86/platform, to queue up dependent patch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/cifs/cifsencrypt.c')
| -rw-r--r-- | fs/cifs/cifsencrypt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/cifsencrypt.c b/fs/cifs/cifsencrypt.c index afa09fce8151..e682b36a210f 100644 --- a/fs/cifs/cifsencrypt.c +++ b/fs/cifs/cifsencrypt.c @@ -714,7 +714,7 @@ setup_ntlmv2_rsp(struct cifs_ses *ses, const struct nls_table *nls_cp) ses->auth_key.response = kmalloc(baselen + tilen, GFP_KERNEL); if (!ses->auth_key.response) { - rc = ENOMEM; + rc = -ENOMEM; ses->auth_key.len = 0; goto setup_ntlmv2_rsp_ret; } |