From: Manish Chopra Date: Thu, 15 Aug 2013 12:27:27 +0000 (-0400) Subject: qlcnic: Fix driver initialization for 83xx adapters X-Git-Tag: accepted/tizen/common/20141203.182822~1569^2~286 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b5acb255e6588cc391d1b3c9afcd80407c2581b3;p=platform%2Fkernel%2Flinux-arm64.git qlcnic: Fix driver initialization for 83xx adapters o Load firmware from file before setting up interrupts. Signed-off-by: Manish Chopra Signed-off-by: Sucheta Chakraborty Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c index cc1e32a..17c26a1 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)