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

Commit b0255a02 authored by Ondrej Zary's avatar Ondrej Zary Committed by David S. Miller
Browse files

de2104x: fix power management 



At least my 21041 cards come out of suspend with bus mastering disabled so
they did not work after resume(no data transferred).
After adding pci_set_master(), the driver oopsed immediately on resume -
because de_clean_rings() is called on suspend but de_init_rings() call
was missing in resume.

Also disable link (reset SIA) before sleep (de4x5 does this too).

Signed-off-by: default avatarOndrej Zary <linux@rainbow-software.org>
Acked-by: default avatarJeff Garzik <jgarzik@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e0f9c4f3

drivers/net/tulip/de2104x.c

+3 −0
Original line number Diff line number Diff line
@@ -1231,6 +1231,7 @@ static void de_adapter_sleep (struct de_private *de) 
	if (de->de21040)

		return;



	dw32(CSR13, 0); /* Reset phy */

	pci_read_config_dword(de->pdev, PCIPM, &pmctl);

	pmctl |= PM_Sleep;

	pci_write_config_dword(de->pdev, PCIPM, pmctl);
@@ -2166,6 +2167,8 @@ static int de_resume (struct pci_dev *pdev) 
		dev_err(&dev->dev, "pci_enable_device failed in resume\n");

		goto out;

	}

	pci_set_master(pdev);

	de_init_rings(de);

	de_init_hw(de);

out_attach:

	netif_device_attach(dev);