Commit e7272403 authored Aug 08, 2008 by Rafael J. Wysocki Committed by Jeff Garzik Sep 18, 2008

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>

parent 78566fec

drivers/net/e100.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -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))) {