* [PATCH]E1000 stop working after resume
@ 2004-11-02 8:45 Li Shaohua
0 siblings, 0 replies; only message in thread
From: Li Shaohua @ 2004-11-02 8:45 UTC (permalink / raw)
To: lkml; +Cc: Andrew Morton
[-- Attachment #1: Type: text/plain, Size: 888 bytes --]
Hi,
Obviously pci_enable_device should be called after pci_restore_state.
Shaohua
Signed-off-by: Li Shaohua <shaohua.li@intel.com>
---
2.6-root/drivers/net/e1000/e1000_main.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletion(-)
diff -puN drivers/net/e1000/e1000_main.c~e1000-resume
drivers/net/e1000/e1000_main.c
--- 2.6/drivers/net/e1000/e1000_main.c~e1000-resume 2004-11-02
16:34:31.665692032 +0800
+++ 2.6-root/drivers/net/e1000/e1000_main.c 2004-11-02
16:35:18.095633608 +0800
@@ -2885,9 +2885,11 @@ e1000_resume(struct pci_dev *pdev)
struct e1000_adapter *adapter = netdev->priv;
uint32_t manc, ret;
- ret = pci_enable_device(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);
pci_enable_wake(pdev, 4, 0); /* 4 == D3 cold */
_
[-- Attachment #2: e1000-resume.patch --]
[-- Type: text/x-patch, Size: 754 bytes --]
---
2.6-root/drivers/net/e1000/e1000_main.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletion(-)
diff -puN drivers/net/e1000/e1000_main.c~e1000-resume drivers/net/e1000/e1000_main.c
--- 2.6/drivers/net/e1000/e1000_main.c~e1000-resume 2004-11-02 16:34:31.665692032 +0800
+++ 2.6-root/drivers/net/e1000/e1000_main.c 2004-11-02 16:35:18.095633608 +0800
@@ -2885,9 +2885,11 @@ e1000_resume(struct pci_dev *pdev)
struct e1000_adapter *adapter = netdev->priv;
uint32_t manc, ret;
- ret = pci_enable_device(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);
pci_enable_wake(pdev, 4, 0); /* 4 == D3 cold */
_
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2004-11-02 8:56 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-11-02 8:45 [PATCH]E1000 stop working after resume Li Shaohua
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®