---

yaml
---
r: 120639
b: refs/heads/master
c: ca38a81
h: refs/heads/master
i:
  120637: 70fae2f
  120635: e465c57
  120631: 8b22ca6
  120623: c0ed1b0
  120607: 7e748d3
  120575: 5667568
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bcf84a38f05c55180bc1225901950c7e715c0d55
+refs/heads/master: ca38a814c6f86db0aa58884a31093d4f096e20aa

trunk/drivers/crypto/talitos.c

@@ -330,11 +330,9 @@ static void flush_channel(struct device *dev, int ch, int error, int reset_ch)
 
 		/* descriptors with their done bits set don't get the error */
 		rmb();
-		if ((request->desc->hdr & DESC_HDR_DONE) == DESC_HDR_DONE) {
+		if ((request->desc->hdr & DESC_HDR_DONE) == DESC_HDR_DONE)
 			status = 0;
-			/* Ack each pkt completed on channel */
-			out_be32(priv->reg + TALITOS_ICR, (1 << (ch * 2)));
-		} else
+		else
 			if (!error)
 				break;
 			else
@@ -575,17 +573,13 @@ static irqreturn_t talitos_interrupt(int irq, void *data)
 
 	isr = in_be32(priv->reg + TALITOS_ISR);
 	isr_lo = in_be32(priv->reg + TALITOS_ISR_LO);
+	/* Acknowledge interrupt */
+	out_be32(priv->reg + TALITOS_ICR, isr);
+	out_be32(priv->reg + TALITOS_ICR_LO, isr_lo);
 
-	if (unlikely((isr & ~TALITOS_ISR_CHDONE) || isr_lo)) {
-		/*
-		 * Acknowledge error interrupts here.
-		 * Done interrupts are ack'ed as part of done_task.
-		 */
-		out_be32(priv->reg + TALITOS_ICR, isr);
-		out_be32(priv->reg + TALITOS_ICR_LO, isr_lo);
-
+	if (unlikely((isr & ~TALITOS_ISR_CHDONE) || isr_lo))
 		talitos_error((unsigned long)data, isr, isr_lo);
-	} else
+	else
 		if (likely(isr & TALITOS_ISR_CHDONE)) {
 			/* mask further done interrupts. */
 			clrbits32(priv->reg + TALITOS_IMR, TALITOS_IMR_DONE);