From b01cc9b6d7e4f0fadb22ebfe46c83be4028481aa Mon Sep 17 00:00:00 2001
From: Shirish Pargaonkar <shirishpargaonkar@gmail.com>
Date: Sat, 29 Jan 2011 13:54:58 -0600
Subject: [PATCH] --- yaml --- r: 232713 b: refs/heads/master c:
 7a8587e7c8e4e32ba778bfbbb822a0a7e8d5f3e3 h: refs/heads/master i:   232711:
 3204a3a4938d7133821989aacd50fdcc7f5d92d6 v: v3

---
 [refs]                      | 2 +-
 trunk/fs/cifs/cifsencrypt.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4d26e8e3ffdd..470ad4c66404 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31c2659d78c8be970833bc1e633593d291553ed3
+refs/heads/master: 7a8587e7c8e4e32ba778bfbbb822a0a7e8d5f3e3
diff --git a/trunk/fs/cifs/cifsencrypt.c b/trunk/fs/cifs/cifsencrypt.c
index 0db5f1de0227..a51585f9852b 100644
--- a/trunk/fs/cifs/cifsencrypt.c
+++ b/trunk/fs/cifs/cifsencrypt.c
@@ -657,9 +657,10 @@ calc_seckey(struct cifsSesInfo *ses)
 	get_random_bytes(sec_key, CIFS_SESS_KEY_SIZE);
 
 	tfm_arc4 = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC);
-	if (!tfm_arc4 || IS_ERR(tfm_arc4)) {
+	if (IS_ERR(tfm_arc4)) {
+		rc = PTR_ERR(tfm_arc4);
 		cERROR(1, "could not allocate crypto API arc4\n");
-		return PTR_ERR(tfm_arc4);
+		return rc;
 	}
 
 	desc.tfm = tfm_arc4;