From: Jeff Kirsher Date: Fri, 24 Mar 2017 03:47:15 +0000 (-0700) Subject: Revert "e1000e: driver trying to free already-free irq" X-Git-Tag: v4.1.12-105.0.20170622_2100~115 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8a0ca7aa4c34fb5a976c6d9c24f5d1958bd12741;p=users%2Fjedix%2Flinux-maple.git Revert "e1000e: driver trying to free already-free irq" This reverts commit 7e54d9d063fa239c95c21548c5267f0ef419ff56. 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 Signed-off-by: David S. Miller Orabug: 26243014 (cherry picked from commit 9f47a48e6eb97d793db85373e3ef4c55d876d334) Signed-off-by: Jack Vogel Reviewed-by: Ethan Zhao --- diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 77ae408fa0f2..671933ad6c9a 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -6283,8 +6283,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);