aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/qlcnic/qlcnic_main.c
diff options
context:
space:
mode:
authorSucheta Chakraborty <sucheta.chakraborty@qlogic.com>2010-05-12 23:07:48 -0400
committerDavid S. Miller <davem@davemloft.net>2010-05-14 06:08:01 -0400
commitb3a2464941e32ca58059cba68012105e35ce84af (patch)
tree1cd60c8732140819958f9acde18960c80586a3cc /drivers/net/qlcnic/qlcnic_main.c
parent96f8118c25ea812335986d96a68441c2bcb01fe0 (diff)
qlcnic: check device class
pci-func class can be other than ethernet in Qlogic CNA device. Signed-off-by: Sucheta Chakraborty <sucheta.chakraborty@qlogic.com> Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/qlcnic/qlcnic_main.c')
-rw-r--r--drivers/net/qlcnic/qlcnic_main.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c
index 54a6bb20ec07..79c6e0517bad 100644
--- a/drivers/net/qlcnic/qlcnic_main.c
+++ b/drivers/net/qlcnic/qlcnic_main.c
@@ -1080,17 +1080,13 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
1080 goto err_out_iounmap; 1080 goto err_out_iounmap;
1081 } 1081 }
1082 1082
1083 qlcnic_setup_idc_param(adapter); 1083 if (qlcnic_setup_idc_param(adapter))
1084 goto err_out_iounmap;
1084 1085
1085 err = qlcnic_start_firmware(adapter); 1086 err = qlcnic_start_firmware(adapter);
1086 if (err) 1087 if (err)
1087 goto err_out_decr_ref; 1088 goto err_out_decr_ref;
1088 1089
1089 /*
1090 * See if the firmware gave us a virtual-physical port mapping.
1091 */
1092 adapter->physical_port = adapter->portnum;
1093
1094 qlcnic_clear_stats(adapter); 1090 qlcnic_clear_stats(adapter);
1095 1091
1096 qlcnic_setup_intr(adapter); 1092 qlcnic_setup_intr(adapter);