From 1dc0f3c54ce1df957f99c17b145488fd03eb1a59 Mon Sep 17 00:00:00 2001 From: Rajesh Borundia Date: Thu, 16 Dec 2010 22:59:02 +0000 Subject: qlcnic: reset pci function unconditionally during probe Some boot code drivers dont have cleanup routine, so pci function remains in unknown state prior to driver load. So during driver load issue FLR unconditionally. Update driver version to 5.0.14. Signed-off-by: Rajesh Borundia Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller --- drivers/net/qlcnic/qlcnic_main.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'drivers/net/qlcnic/qlcnic_main.c') diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c index 788850e2ba4e..11e3a46c0911 100644 --- a/drivers/net/qlcnic/qlcnic_main.c +++ b/drivers/net/qlcnic/qlcnic_main.c @@ -1468,7 +1468,6 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) uint8_t revision_id; uint8_t pci_using_dac; char brd_name[QLCNIC_MAX_BOARD_NAME_LEN]; - u32 val; err = pci_enable_device(pdev); if (err) @@ -1530,9 +1529,7 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) if (err) goto err_out_iounmap; - val = QLCRD32(adapter, QLCNIC_CRB_DRV_ACTIVE); - if (QLC_DEV_CHECK_ACTIVE(val, adapter->portnum)) - adapter->flags |= QLCNIC_NEED_FLR; + adapter->flags |= QLCNIC_NEED_FLR; err = adapter->nic_ops->start_firmware(adapter); if (err) { -- cgit v1.2.3-59-g8ed1b