Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5acb255 authored by Manish Chopra's avatar Manish Chopra Committed by David S. Miller
Browse files

qlcnic: Fix driver initialization for 83xx adapters 



o Load firmware from file before setting up interrupts.

Signed-off-by: default avatarManish Chopra <manish.chopra@qlogic.com>
Signed-off-by: default avatarSucheta Chakraborty <sucheta.chakraborty@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 35570cfe

drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c

+7 −7
Original line number Diff line number Diff line
@@ -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)