diff --git a/[refs] b/[refs]
index f581957a80c1..7989478768bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d11911a8c572041880c8d86229f6ed971f6f7e2
+refs/heads/master: 0b798247453299c895e3fa1629101dd5e94901b2
diff --git a/trunk/drivers/crypto/talitos.c b/trunk/drivers/crypto/talitos.c
index bbf39991c0d0..1444f8c4dbdd 100644
--- a/trunk/drivers/crypto/talitos.c
+++ b/trunk/drivers/crypto/talitos.c
@@ -2333,8 +2333,7 @@ static int talitos_remove(struct of_device *ofdev)
 		talitos_unregister_rng(dev);
 
 	for (i = 0; i < priv->num_channels; i++)
-		if (priv->chan[i].fifo)
-			kfree(priv->chan[i].fifo);
+		kfree(priv->chan[i].fifo);
 
 	kfree(priv->chan);