Skip to content

Commit

Permalink
e100: Use pci_pme_active to clear PME_Status and disable PME#
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Rafael J. Wysocki authored and Jeff Garzik committed Sep 19, 2008
1 parent 78566fe commit e727240
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/net/e100.c
Original file line number Diff line number Diff line change
Expand Up @@ -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))) {
Expand Down

0 comments on commit e727240

Please sign in to comment.