浏览代码

qlcnic: Fix panic due to uninitialzed delayed_work struct in use.

o AEN event was being received before initializing delayed_work struct
  and handlers for it. This was resulting in crash. This patch fixes it.

Signed-off-by: Sucheta Chakraborty <sucheta.chakraborty@qlogic.com>
Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Sucheta Chakraborty 11 年之前
父节点
当前提交
463518a0cb
共有 1 个文件被更改,包括 2 次插入3 次删除
  1. 2 3
      drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c

+ 2 - 3
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c

@@ -2348,14 +2348,13 @@ int qlcnic_83xx_init(struct qlcnic_adapter *adapter, int pci_using_dac)
 		goto disable_intr;
 		goto disable_intr;
 	}
 	}
 
 
+	INIT_DELAYED_WORK(&adapter->idc_aen_work, qlcnic_83xx_idc_aen_work);
+
 	err = qlcnic_83xx_setup_mbx_intr(adapter);
 	err = qlcnic_83xx_setup_mbx_intr(adapter);
 	if (err)
 	if (err)
 		goto disable_mbx_intr;
 		goto disable_mbx_intr;
 
 
 	qlcnic_83xx_clear_function_resources(adapter);
 	qlcnic_83xx_clear_function_resources(adapter);
-
-	INIT_DELAYED_WORK(&adapter->idc_aen_work, qlcnic_83xx_idc_aen_work);
-
 	qlcnic_83xx_initialize_nic(adapter, 1);
 	qlcnic_83xx_initialize_nic(adapter, 1);
 
 
 	/* Configure default, SR-IOV or Virtual NIC mode of operation */
 	/* Configure default, SR-IOV or Virtual NIC mode of operation */