diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-29 11:46:10 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-29 11:46:10 +0200 |
| commit | e93721a70263afefbac781f575bfe851c6f95d84 (patch) | |
| tree | ab359f12a0688802aa99339bae82c51763dae9f6 /drivers/pci/pci.c | |
| parent | ae1ec5e1e97f67d41e641a73380129e5905e41cc (diff) | |
| parent | c87d9732004b3f8fd82d729f12ccfb96c0df279e (diff) | |
Merge branch 'fix/pcm-jiffies-check' into topic/pcm-jiffies-check
Diffstat (limited to 'drivers/pci/pci.c')
| -rw-r--r-- | drivers/pci/pci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 34bf0fdf5047..1a91bf9687af 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -557,7 +557,8 @@ static int pci_platform_power_transition(struct pci_dev *dev, pci_power_t state) } else { error = -ENODEV; /* Fall back to PCI_D0 if native PM is not supported */ - pci_update_current_state(dev, PCI_D0); + if (!dev->pm_cap) + dev->current_state = PCI_D0; } return error; |