Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / drivers / net / ethernet / qlogic / qed / qed_main.c

diff --git a/drivers/net/ethernet/qlogic/qed/qed_main.c b/drivers/net/ethernet/qlogic/qed/qed_main.c
index b7ad36b91e12cb71bf6658ec8e568cc61472850f..715b3aaf83ac4d65cdea4eb15f6f2089e402c469 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_main.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_main.c
@@ -978,7 +978,7 @@ static int qed_slowpath_start(struct qed_dev *cdev,
                if (rc)
                        goto err2;
 
-               /* First Dword used to diffrentiate between various sources */
+               /* First Dword used to differentiate between various sources */
                data = cdev->firmware->data + sizeof(u32);
 
                qed_dbg_pf_init(cdev);
@@ -1093,10 +1093,12 @@ static int qed_slowpath_stop(struct qed_dev *cdev)
                qed_free_stream_mem(cdev);
                if (IS_QED_ETH_IF(cdev))
                        qed_sriov_disable(cdev, true);
+       }
+
+       qed_nic_stop(cdev);
 
-               qed_nic_stop(cdev);
+       if (IS_PF(cdev))
                qed_slowpath_irq_free(cdev);
-       }
 
        qed_disable_msix(cdev);
 
@@ -1728,7 +1730,8 @@ void qed_get_protocol_stats(struct qed_dev *cdev,
                qed_get_protocol_stats_iscsi(cdev, &stats->iscsi_stats);
                break;
        default:
-               DP_ERR(cdev, "Invalid protocol type = %d\n", type);
+               DP_VERBOSE(cdev, QED_MSG_SP,
+                          "Invalid protocol type = %d\n", type);
                return;
        }
 }