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 14:46:18 -0700 |
| commit | b5acb255e6588cc391d1b3c9afcd80407c2581b3 (patch) | |
| tree | 4b62cd5c2a409a09cbe54a6aa83be94094044297 /drivers/net/ethernet/qlogic | |
| parent | qlcnic: Flush mailbox command list when mailbox is not available (diff) | |
| download | linux-dev-b5acb255e6588cc391d1b3c9afcd80407c2581b3.tar.xz linux-dev-b5acb255e6588cc391d1b3c9afcd80407c2581b3.zip | |
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/qlogic')
| -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) if (err) goto detach_mbx; + if (!qlcnic_83xx_read_flash_descriptor_table(adapter)) + qlcnic_83xx_read_flash_mfg_id(adapter); + + err = qlcnic_83xx_idc_init(adapter); + if (err) + goto detach_mbx; + err = qlcnic_setup_intr(adapter, 0); if (err) { 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) /* register for NIC IDC AEN Events */ qlcnic_83xx_register_nic_idc_func(adapter, 1); - if (!qlcnic_83xx_read_flash_descriptor_table(adapter)) - qlcnic_83xx_read_flash_mfg_id(adapter); - - err = qlcnic_83xx_idc_init(adapter); - if (err) - goto disable_mbx_intr; - /* Configure default, SR-IOV or Virtual NIC mode of operation */ err = qlcnic_83xx_configure_opmode(adapter); if (err) |