commit 842de16e26a2db1416628970b36c0e575cff6c80
author Linux Build Service Account <lnxbuild@localhost> Fri Mar 15 01:46:31 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Mar 15 01:46:30 2013 -0700
tree 7dc103c4d1b92e6e6b4849b4cd93ffa073ceb3e0
parent a47eec2c217327c6fdbd6f8568d412c5e01649dc
parent 92db2c38beebcbf76dfae5715e71615866f91973

Merge "crypto: msm: Reset encr_cfg before auth operation"

drivers/crypto/msm/qce50.c

diff --git a/drivers/crypto/msm/qce50.c b/drivers/crypto/msm/qce50.c
index 1facf24..53cf480 100644
--- a/drivers/crypto/msm/qce50.c
+++ b/drivers/crypto/msm/qce50.c
@@ -353,6 +353,9 @@
 	pce = cmdlistinfo->auth_seg_size;
 	pce->data = sreq->size;
 
+	pce = cmdlistinfo->encr_seg_cfg;
+	pce->data = 0;
+
 	/* write auth seg size start*/
 	pce = cmdlistinfo->auth_seg_start;
 	pce->data = 0;
@@ -521,8 +524,12 @@
 			pce->data = totallen_in - creq->authsize;
 		pce = cmdlistinfo->auth_seg_start;
 		pce->data = 0;
+	} else {
+		if (creq->op != QCE_REQ_AEAD) {
+			pce = cmdlistinfo->auth_seg_cfg;
+			pce->data = 0;
+		}
 	}
-
 	switch (creq->mode) {
 	case QCE_MODE_ECB:
 		encr_cfg |= (CRYPTO_ENCR_MODE_ECB << CRYPTO_ENCR_MODE);