diff options
| -rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c index 304e247bdf33..ffbae293cef5 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | |||
| @@ -136,7 +136,7 @@ int qlcnic_82xx_issue_cmd(struct qlcnic_adapter *adapter, | |||
| 136 | rsp = qlcnic_poll_rsp(adapter); | 136 | rsp = qlcnic_poll_rsp(adapter); |
| 137 | 137 | ||
| 138 | if (rsp == QLCNIC_CDRP_RSP_TIMEOUT) { | 138 | if (rsp == QLCNIC_CDRP_RSP_TIMEOUT) { |
| 139 | dev_err(&pdev->dev, "card response timeout.\n"); | 139 | dev_err(&pdev->dev, "command timeout, response = 0x%x\n", rsp); |
| 140 | cmd->rsp.arg[0] = QLCNIC_RCODE_TIMEOUT; | 140 | cmd->rsp.arg[0] = QLCNIC_RCODE_TIMEOUT; |
| 141 | } else if (rsp == QLCNIC_CDRP_RSP_FAIL) { | 141 | } else if (rsp == QLCNIC_CDRP_RSP_FAIL) { |
| 142 | cmd->rsp.arg[0] = QLCRD32(adapter, QLCNIC_CDRP_ARG(1), &err); | 142 | cmd->rsp.arg[0] = QLCRD32(adapter, QLCNIC_CDRP_ARG(1), &err); |
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c index 4fc186713b66..158e1d9f255f 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | |||
| @@ -2623,13 +2623,13 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 2623 | if (err) | 2623 | if (err) |
| 2624 | goto err_out_disable_mbx_intr; | 2624 | goto err_out_disable_mbx_intr; |
| 2625 | 2625 | ||
| 2626 | if (adapter->portnum == 0) | ||
| 2627 | qlcnic_set_drv_version(adapter); | ||
| 2628 | |||
| 2626 | err = qlcnic_setup_netdev(adapter, netdev, pci_using_dac); | 2629 | err = qlcnic_setup_netdev(adapter, netdev, pci_using_dac); |
| 2627 | if (err) | 2630 | if (err) |
| 2628 | goto err_out_disable_mbx_intr; | 2631 | goto err_out_disable_mbx_intr; |
| 2629 | 2632 | ||
| 2630 | if (adapter->portnum == 0) | ||
| 2631 | qlcnic_set_drv_version(adapter); | ||
| 2632 | |||
| 2633 | pci_set_drvdata(pdev, adapter); | 2633 | pci_set_drvdata(pdev, adapter); |
| 2634 | 2634 | ||
| 2635 | if (qlcnic_82xx_check(adapter)) | 2635 | if (qlcnic_82xx_check(adapter)) |
