Commit 9f47a48e authored by Jeff Kirsher's avatar Jeff Kirsher Committed by David S. Miller

Revert "e1000e: driver trying to free already-free irq"

This reverts commit 7e54d9d0.

After additional regression testing, several users are experiencing
kernel panics during shutdown on e1000e devices.  Reverting this
change resolves the issue.
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a80db69e
...@@ -6274,8 +6274,8 @@ static int e1000e_pm_freeze(struct device *dev) ...@@ -6274,8 +6274,8 @@ static int e1000e_pm_freeze(struct device *dev)
/* Quiesce the device without resetting the hardware */ /* Quiesce the device without resetting the hardware */
e1000e_down(adapter, false); e1000e_down(adapter, false);
e1000_free_irq(adapter); e1000_free_irq(adapter);
e1000e_reset_interrupt_capability(adapter);
} }
e1000e_reset_interrupt_capability(adapter);
/* Allow time for pending master requests to run */ /* Allow time for pending master requests to run */
e1000e_disable_pcie_master(&adapter->hw); e1000e_disable_pcie_master(&adapter->hw);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment