Skip to content

Commit

Permalink
Revert "e1000e: driver trying to free already-free irq"
Browse files Browse the repository at this point in the history
This reverts commit 7e54d9d.

After additional regression testing, several users are experiencing
kernel panics during shutdown on e1000e devices.  Reverting this
change resolves the issue.

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Jeff Kirsher authored and David S. Miller committed Mar 24, 2017
1 parent a80db69 commit 9f47a48
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/net/ethernet/intel/e1000e/netdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -6274,8 +6274,8 @@ static int e1000e_pm_freeze(struct device *dev)
/* Quiesce the device without resetting the hardware */
e1000e_down(adapter, false);
e1000_free_irq(adapter);
e1000e_reset_interrupt_capability(adapter);
}
e1000e_reset_interrupt_capability(adapter);

/* Allow time for pending master requests to run */
e1000e_disable_pcie_master(&adapter->hw);
Expand Down

0 comments on commit 9f47a48

Please sign in to comment.