diff --git a/[refs] b/[refs]
index e70cc267c618..eb06cc740973 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c63db821d4663c92cd326f6adb8f3d627971a53
+refs/heads/master: ed635cb85efbeebc974c1c477ddc971f5dcc962e
diff --git a/trunk/drivers/crypto/omap-sham.c b/trunk/drivers/crypto/omap-sham.c
index a8de7b890d45..7ca707536f8d 100644
--- a/trunk/drivers/crypto/omap-sham.c
+++ b/trunk/drivers/crypto/omap-sham.c
@@ -1084,7 +1084,6 @@ static irqreturn_t omap_sham_irq(int irq, void *dev_id)
 	omap_sham_read(dd, SHA_REG_CTRL);
 
 	set_bit(FLAGS_OUTPUT_READY, &dd->flags);
-	dd->err = 0;
 	tasklet_schedule(&dd->done_task);
 
 	return IRQ_HANDLED;