diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2008-08-08 00:18:04 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-09-18 21:42:50 -0400 |
| commit | e7272403d2f9be3dbb7cc185fcc390e781b1af6b (patch) | |
| tree | 93a3b247e840c39d83fbdc5073f7189b01136b56 | |
| parent | 78566fecbb12a7616ae9a88b2ffbc8062c4a89e3 (diff) | |
| download | op-kernel-dev-e7272403d2f9be3dbb7cc185fcc390e781b1af6b.zip op-kernel-dev-e7272403d2f9be3dbb7cc185fcc390e781b1af6b.tar.gz | |
e100: Use pci_pme_active to clear PME_Status and disable PME#
Currently e100 uses pci_enable_wake() to clear pending wake-up events
and disable PME# during intitialization, but that function is not
suitable for this purpose, because it immediately returns error code
if device_may_wakeup() returns false for given device.
Make e100 use pci_pme_active(), which carries out exactly the
required operations, instead.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| -rw-r--r-- | drivers/net/e100.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index 453115a..5cf78d6 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c @@ -2738,9 +2738,7 @@ static int __devinit e100_probe(struct pci_dev *pdev, nic->flags |= wol_magic; /* ack any pending wake events, disable PME */ - err = pci_enable_wake(pdev, 0, 0); - if (err) - DPRINTK(PROBE, ERR, "Error clearing wake event\n"); + pci_pme_active(pdev, false); strcpy(netdev->name, "eth%d"); if((err = register_netdev(netdev))) { |
