Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts were easy to resolve using immediate context mostly,
except the cls_u32.c one where I simply too the entire HEAD
chunk.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/crypto/inside-secure/safexcel.c b/drivers/crypto/inside-secure/safexcel.c
index 7e71043457a6..86c699c14f84 100644
--- a/drivers/crypto/inside-secure/safexcel.c
+++ b/drivers/crypto/inside-secure/safexcel.c
@@ -1044,7 +1044,8 @@ static int safexcel_probe(struct platform_device *pdev)
 
         safexcel_configure(priv);
 
-        priv->ring = devm_kzalloc(dev, priv->config.rings * sizeof(*priv->ring),
+        priv->ring = devm_kcalloc(dev, priv->config.rings,
+                                  sizeof(*priv->ring),
                                   GFP_KERNEL);
         if (!priv->ring) {
                 ret = -ENOMEM;
@@ -1063,8 +1064,9 @@ static int safexcel_probe(struct platform_device *pdev)
                 if (ret)
                         goto err_reg_clk;
 
-                priv->ring[i].rdr_req = devm_kzalloc(dev,
-                        sizeof(priv->ring[i].rdr_req) * EIP197_DEFAULT_RING_SIZE,
+                priv->ring[i].rdr_req = devm_kcalloc(dev,
+                        EIP197_DEFAULT_RING_SIZE,
+                        sizeof(priv->ring[i].rdr_req),
                         GFP_KERNEL);
                 if (!priv->ring[i].rdr_req) {
                         ret = -ENOMEM;