Merge tag 'v3.18' into for_next

[firefly-linux-kernel-4.4.55.git] / drivers / crypto / talitos.c

diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c
index 5967667e1a8f19c763445183bc2c4dc6cdde71a7..624b8be0c3650e311cefad544d194d4e3cabc282 100644 (file)
--- a/drivers/crypto/talitos.c
+++ b/drivers/crypto/talitos.c
@@ -2637,6 +2637,8 @@ static int talitos_probe(struct platform_device *ofdev)
        if (!priv)
                return -ENOMEM;
 
+       INIT_LIST_HEAD(&priv->alg_list);
+
        dev_set_drvdata(dev, priv);
 
        priv->ofdev = ofdev;
@@ -2657,8 +2659,6 @@ static int talitos_probe(struct platform_device *ofdev)
                             (unsigned long)dev);
        }
 
-       INIT_LIST_HEAD(&priv->alg_list);
-
        priv->reg = of_iomap(np, 0);
        if (!priv->reg) {
                dev_err(dev, "failed to of_iomap\n");