From f6741051238e90f112d271a09b5bf6fca22a86ca Mon Sep 17 00:00:00 2001
From: Roopa Prabhu <roprabhu@cisco.com>
Date: Thu, 19 Jan 2012 22:25:36 +0000
Subject: [PATCH] --- yaml --- r: 286675 b: refs/heads/master c:
 b67f231ded332461dd31123c4f659c4681223fb1 h: refs/heads/master i:   286673:
 303a00e8e399be08c1b2af6617d838aa82ecb19d   286671:
 2f14e4076d2076cbc0273c2d056775212b5450dd v: v3

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

diff --git a/[refs] b/[refs]
index 00606c2b1b94..f9e47535e294 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d8fe98f8d5cb303d907d8f94ea6dc1f9a1d8b7a
+refs/heads/master: b67f231ded332461dd31123c4f659c4681223fb1
diff --git a/trunk/drivers/net/ethernet/cisco/enic/enic_main.c b/trunk/drivers/net/ethernet/cisco/enic/enic_main.c
index 045c468ac8ef..ab3f67f980d8 100644
--- a/trunk/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/trunk/drivers/net/ethernet/cisco/enic/enic_main.c
@@ -2273,7 +2273,7 @@ static int __devinit enic_probe(struct pci_dev *pdev,
 #ifdef CONFIG_PCI_IOV
 	int pos = 0;
 #endif
-	int num_pps;
+	int num_pps = 1;
 
 	/* Allocate net device structure and initialize.  Private
 	 * instance data is initialized to zero.
@@ -2380,11 +2380,11 @@ static int __devinit enic_probe(struct pci_dev *pdev,
 				goto err_out_vnic_unregister;
 			}
 			enic->priv_flags |= ENIC_SRIOV_ENABLED;
+			num_pps = enic->num_vfs;
 		}
 	}
 #endif
 
-	num_pps = enic->num_vfs ? enic->num_vfs : 1;
 	/* Allocate structure for port profiles */
 	enic->pp = kcalloc(num_pps, sizeof(*enic->pp), GFP_KERNEL);
 	if (!enic->pp) {