Subject: Re: [net] Revert "e1000e: driver trying to free already-free irq"

From: Jeff Kirsher <[email-masked]>
Date: Thu, 23 Mar 2017 20:57:26 -0700

On Thu, 2017-03-23 at 20:47 -0700, Jeff Kirsher wrote:
> 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 <[email-masked]>

CC: <[email-masked]>

Sorry, meant to queue this up for stable as well.

> ---
>  drivers/net/ethernet/intel/e1000e/netdev.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c
> b/drivers/net/ethernet/intel/e1000e/netdev.c
> index 2175cced402f..e9af89ad039c 100644
> --- a/drivers/net/ethernet/intel/e1000e/netdev.c
> +++ b/drivers/net/ethernet/intel/e1000e/netdev.c
> @@ -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);