diff options
author | Manish Chopra <manish.chopra@qlogic.com> | 2013-08-15 08:27:27 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-08-15 17:46:18 -0400 |
commit | b5acb255e6588cc391d1b3c9afcd80407c2581b3 (patch) | |
tree | 4b62cd5c2a409a09cbe54a6aa83be94094044297 /drivers/net/ethernet | |
parent | 35570cfefd15d89ede00ce550e06acbcac3b3098 (diff) |
qlcnic: Fix driver initialization for 83xx adapters
o Load firmware from file before setting up interrupts.
Signed-off-by: Manish Chopra <manish.chopra@qlogic.com>
Signed-off-by: Sucheta Chakraborty <sucheta.chakraborty@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c index cc1e32a7248f..17c26a1158a0 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | |||
@@ -2169,6 +2169,13 @@ int qlcnic_83xx_init(struct qlcnic_adapter *adapter, int pci_using_dac) | |||
2169 | if (err) | 2169 | if (err) |
2170 | goto detach_mbx; | 2170 | goto detach_mbx; |
2171 | 2171 | ||
2172 | if (!qlcnic_83xx_read_flash_descriptor_table(adapter)) | ||
2173 | qlcnic_83xx_read_flash_mfg_id(adapter); | ||
2174 | |||
2175 | err = qlcnic_83xx_idc_init(adapter); | ||
2176 | if (err) | ||
2177 | goto detach_mbx; | ||
2178 | |||
2172 | err = qlcnic_setup_intr(adapter, 0); | 2179 | err = qlcnic_setup_intr(adapter, 0); |
2173 | if (err) { | 2180 | if (err) { |
2174 | dev_err(&adapter->pdev->dev, "Failed to setup interrupt\n"); | 2181 | dev_err(&adapter->pdev->dev, "Failed to setup interrupt\n"); |
@@ -2186,13 +2193,6 @@ int qlcnic_83xx_init(struct qlcnic_adapter *adapter, int pci_using_dac) | |||
2186 | /* register for NIC IDC AEN Events */ | 2193 | /* register for NIC IDC AEN Events */ |
2187 | qlcnic_83xx_register_nic_idc_func(adapter, 1); | 2194 | qlcnic_83xx_register_nic_idc_func(adapter, 1); |
2188 | 2195 | ||
2189 | if (!qlcnic_83xx_read_flash_descriptor_table(adapter)) | ||
2190 | qlcnic_83xx_read_flash_mfg_id(adapter); | ||
2191 | |||
2192 | err = qlcnic_83xx_idc_init(adapter); | ||
2193 | if (err) | ||
2194 | goto disable_mbx_intr; | ||
2195 | |||
2196 | /* Configure default, SR-IOV or Virtual NIC mode of operation */ | 2196 | /* Configure default, SR-IOV or Virtual NIC mode of operation */ |
2197 | err = qlcnic_83xx_configure_opmode(adapter); | 2197 | err = qlcnic_83xx_configure_opmode(adapter); |
2198 | if (err) | 2198 | if (err) |