On Thu, 2013-03-07 at 03:15 -0800, Jeff Kirsher wrote: > From: Konstantin Khlebnikov <[email protected]> > > 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 <[email protected]>
CC: stable <[email protected]> This time with the correct email for stable. > Signed-off-by: Konstantin Khlebnikov <[email protected]> > Acked-by: Rafael J. Wysocki <[email protected]> > Tested-by: Borislav Petkov <[email protected]> > Tested-by: Aaron Brown <[email protected]> > Signed-off-by: Jeff Kirsher <[email protected]> > --- > 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; > }
signature.asc
Description: This is a digitally signed message part
