Skip to content

Commit

Permalink
fm10k: free MBX IRQ before clearing interrupt scheme
Browse files Browse the repository at this point in the history
During fm10k_io_error_detected we were clearing the interrupt scheme
before we freed the MBX IRQ. This causes a kernel panic because the MBX
IRQ are assigned after MSI-X initialization. Clearing the interrupt
scheme results in removing the MSI-X entry table. Fix this by freeing
the MBX IRQ before we clear the interrupt scheme, as we do elsewhere in
the driver.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Krishneil Singh <Krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
  • Loading branch information
Jacob Keller authored and Jeff Kirsher committed Apr 5, 2016
1 parent 61e0217 commit c8ed563
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/net/ethernet/intel/fm10k/fm10k_pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -2274,11 +2274,11 @@ static pci_ers_result_t fm10k_io_error_detected(struct pci_dev *pdev,
if (netif_running(netdev))
fm10k_close(netdev);

fm10k_mbx_free_irq(interface);

/* free interrupts */
fm10k_clear_queueing_scheme(interface);

fm10k_mbx_free_irq(interface);

pci_disable_device(pdev);

/* Request a slot reset. */
Expand Down

0 comments on commit c8ed563

Please sign in to comment.