From ea0a75c0fa80d27c618272ce6b0b7178ecf8e287 Mon Sep 17 00:00:00 2001
From: Thomas Meyer <thomas@m3y3r.de>
Date: Tue, 29 Nov 2011 11:08:00 +0000
Subject: [PATCH] --- yaml --- r: 278341 b: refs/heads/master c:
 a1de22191bc4c47ff50ef3274295f4384074696b h: refs/heads/master i:   278339:
 3dcc2f0a1179d56deb13ef5b98d56858dd04588b v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/net/ethernet/cisco/enic/enic_main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9ca4a24228d9..d23dbd9046c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01e23742b276cb8cb53bf727c4b1c50fae1860e7
+refs/heads/master: a1de22191bc4c47ff50ef3274295f4384074696b
diff --git a/trunk/drivers/net/ethernet/cisco/enic/enic_main.c b/trunk/drivers/net/ethernet/cisco/enic/enic_main.c
index 1fe5df0284a6..2fd9db4b1be5 100644
--- a/trunk/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/trunk/drivers/net/ethernet/cisco/enic/enic_main.c
@@ -2379,7 +2379,7 @@ static int __devinit enic_probe(struct pci_dev *pdev,
 
 #endif
 	/* Allocate structure for port profiles */
-	enic->pp = kzalloc(num_pps * sizeof(*enic->pp), GFP_KERNEL);
+	enic->pp = kcalloc(num_pps, sizeof(*enic->pp), GFP_KERNEL);
 	if (!enic->pp) {
 		pr_err("port profile alloc failed, aborting\n");
 		err = -ENOMEM;