Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4cb847d authored by Malli Chilakala's avatar Malli Chilakala Committed by Jeff Garzik
Browse files

[PATCH] e1000: e1000 stops working after resume 



e1000 stops working after resume, call pci_enable_device after pci_restore_state - Modified Andrew Morton's patch

Signed-off-by: default avatarMallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: default avatarGanesh Venkatesan <ganesh.venkatesan@intel.com>
Signed-off-by: default avatarJohn Ronciak <john.ronciak@intel.com>
diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c
parent 6d915757

drivers/net/e1000/e1000_main.c

+1 −2
Original line number Diff line number Diff line
@@ -3173,7 +3173,6 @@ e1000_resume(struct pci_dev *pdev) 
	pci_set_power_state(pdev, 0);

	pci_restore_state(pdev);

	ret = pci_enable_device(pdev);

	if (pdev->is_busmaster)

	pci_set_master(pdev);



	pci_enable_wake(pdev, 3, 0);