From 869f4f9d8768c4948f2a0353f3f1253176a70e87 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Mon, 5 Oct 2009 00:48:40 +0200 Subject: [PATCH] --- yaml --- r: 167382 b: refs/heads/master c: e13cdbd71fe12c4e191b737c4a3dbfdb4b2de03b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pci/pci.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b9d52981e1af..4363dbdbc65f 100644 --- 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 index 6edecff0b419..6e1da5aa7bb9 100644 --- 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