---

yaml --- r: 167382 b: refs/heads/master c: e13cdbd h: refs/heads/master v: v3
git-mirror · Oct 6, 2009 · 869f4f9 · 869f4f9
1 parent 4048dbf
commit 869f4f9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b812cca4e2efe9a05de20ccf3f8587e7ac6e12fa
+refs/heads/master: e13cdbd71fe12c4e191b737c4a3dbfdb4b2de03b
diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c
@@ -513,7 +513,11 @@ static int pci_raw_set_power_state(struct pci_dev *dev, pci_power_t state)
 	else if (state == PCI_D2 || dev->current_state == PCI_D2)
 		udelay(PCI_PM_D2_DELAY);
 
-	dev->current_state = state;
+	pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr);
+	dev->current_state = (pmcsr & PCI_PM_CTRL_STATE_MASK);
+	if (dev->current_state != state && printk_ratelimit())
+		dev_info(&dev->dev, "Refused to change power state, "
+			"currently in D%d\n", dev->current_state);
 
 	/* According to section 5.4.1 of the "PCI BUS POWER MANAGEMENT
 	 * INTERFACE SPECIFICATION, REV. 1.2", a device transitioning