[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1362655188.4164.37.camel@jtkirshe-mobl>
Date: Thu, 07 Mar 2013 03:19:48 -0800
From: Jeff Kirsher <jeffrey.t.kirsher@...el.com>
To: davem@...emloft.net
Cc: Konstantin Khlebnikov <khlebnikov@...nvz.org>,
netdev@...r.kernel.org, gospo@...hat.com, sassmann@...hat.com,
Bruce Allan <bruce.w.allan@...el.com>,
Stable <stable@...r.kernel.org>
Subject: Re: [net 1/3] e1000e: fix pci-device enable-counter balance
On Thu, 2013-03-07 at 03:15 -0800, Jeff Kirsher wrote:
> From: Konstantin Khlebnikov <khlebnikov@...nvz.org>
>
> This patch removes redundant and unbalanced pci_disable_device() from
> __e1000_shutdown(). pci_clear_master() is enough, device can go into
> suspended state with elevated enable_cnt.
>
> Bug was introduced in commit 23606cf5d1192c2b17912cb2ef6e62f9b11de133
> ("e1000e / PCI / PM: Add basic runtime PM support (rev. 4)") in v2.6.35
>
> Cc: Bruce Allan <bruce.w.allan@...el.com>
CC: stable <stable@...r.kernel.org>
This time with the correct email for stable.
> Signed-off-by: Konstantin Khlebnikov <khlebnikov@...nvz.org>
> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@...el.com>
> Tested-by: Borislav Petkov <bp@...e.de>
> Tested-by: Aaron Brown <aaron.f.brown@...el.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@...el.com>
> ---
> 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 a177b8b..1799021 100644
> --- a/drivers/net/ethernet/intel/e1000e/netdev.c
> +++ b/drivers/net/ethernet/intel/e1000e/netdev.c
> @@ -5986,7 +5986,7 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake,
> */
> e1000e_release_hw_control(adapter);
>
> - pci_disable_device(pdev);
> + pci_clear_master(pdev);
>
> return 0;
> }
Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)
Powered by blists - more mailing lists