diff options
| -rw-r--r-- | drivers/pci/pci.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 5ea587e59e48..37499127c801 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
| @@ -679,7 +679,7 @@ static void __pci_start_power_transition(struct pci_dev *dev, pci_power_t state) | |||
| 679 | */ | 679 | */ |
| 680 | int __pci_complete_power_transition(struct pci_dev *dev, pci_power_t state) | 680 | int __pci_complete_power_transition(struct pci_dev *dev, pci_power_t state) |
| 681 | { | 681 | { |
| 682 | return state > PCI_D0 ? | 682 | return state >= PCI_D0 ? |
| 683 | pci_platform_power_transition(dev, state) : -EINVAL; | 683 | pci_platform_power_transition(dev, state) : -EINVAL; |
| 684 | } | 684 | } |
| 685 | EXPORT_SYMBOL_GPL(__pci_complete_power_transition); | 685 | EXPORT_SYMBOL_GPL(__pci_complete_power_transition); |
| @@ -716,10 +716,6 @@ int pci_set_power_state(struct pci_dev *dev, pci_power_t state) | |||
| 716 | */ | 716 | */ |
| 717 | return 0; | 717 | return 0; |
| 718 | 718 | ||
| 719 | /* Check if we're already there */ | ||
| 720 | if (dev->current_state == state) | ||
| 721 | return 0; | ||
| 722 | |||
| 723 | __pci_start_power_transition(dev, state); | 719 | __pci_start_power_transition(dev, state); |
| 724 | 720 | ||
| 725 | /* This device is quirked not to be put into D3, so | 721 | /* This device is quirked not to be put into D3, so |
