From 25f56e64ebb216632323f5ed662bdf2ce41dab35 Mon Sep 17 00:00:00 2001 From: Steven Walter Date: Mon, 31 May 2010 17:11:53 +0000 Subject: [PATCH] --- yaml --- r: 202601 b: refs/heads/master c: 7a1d7f01b5e90f85d0b4ec4bfd5a5da769d2bb1d h: refs/heads/master i: 202599: 4941ddfea2366482befe0887510891030f9d0252 v: v3 --- [refs] | 2 +- trunk/drivers/net/tulip/tulip_core.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 35f7e1cc8ef3..07577a0fb166 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 92c4bbfac65e0b0d4d4ea5ed21fddf62323d335b +refs/heads/master: 7a1d7f01b5e90f85d0b4ec4bfd5a5da769d2bb1d diff --git a/trunk/drivers/net/tulip/tulip_core.c b/trunk/drivers/net/tulip/tulip_core.c index 254643ed945e..bd3b41daa892 100644 --- a/trunk/drivers/net/tulip/tulip_core.c +++ b/trunk/drivers/net/tulip/tulip_core.c @@ -1381,6 +1381,13 @@ static int __devinit tulip_init_one (struct pci_dev *pdev, return i; } + /* The chip will fail to enter a low-power state later unless + * first explicitly commanded into D0 */ + if (pci_set_power_state(pdev, PCI_D0)) { + printk (KERN_NOTICE PFX + "Failed to set power state to D0\n"); + } + irq = pdev->irq; /* alloc_etherdev ensures aligned and zeroed private structures */