diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-14 08:39:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-14 08:39:56 -0800 |
| commit | 8528d662489a980305c7b0d1d41aca3e140c1e3d (patch) | |
| tree | 0161b8390b141ba6560fb9309b5efe7f9eafcd16 /drivers/pci | |
| parent | 5d69561b7b32b89380b5390b62e5a0c50bfe6568 (diff) | |
| parent | d49597fd3bc7d9534de55e9256767f073be1b33a (diff) | |
| download | talos-obmc-linux-8528d662489a980305c7b0d1d41aca3e140c1e3d.tar.gz talos-obmc-linux-8528d662489a980305c7b0d1d41aca3e140c1e3d.zip | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"Misc fixes:
- fix an Intel/MID boot crash/hang bug
- fix a cache topology mis-parsing bug on certain AMD CPUs
- fix a virtualization firmware bug by adding a check+quirk
workaround on the kernel side"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/cpu: Deal with broken firmware (VMWare/XEN)
x86/cpu/AMD: Fix cpu_llc_id for AMD Fam17h systems
x86/platform/intel-mid: Retrofit pci_platform_pm_ops ->get_state hook
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/pci-mid.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/pci/pci-mid.c b/drivers/pci/pci-mid.c index 55f453de562e..c7f3408e3148 100644 --- a/drivers/pci/pci-mid.c +++ b/drivers/pci/pci-mid.c @@ -29,6 +29,11 @@ static int mid_pci_set_power_state(struct pci_dev *pdev, pci_power_t state) return intel_mid_pci_set_power_state(pdev, state); } +static pci_power_t mid_pci_get_power_state(struct pci_dev *pdev) +{ + return intel_mid_pci_get_power_state(pdev); +} + static pci_power_t mid_pci_choose_state(struct pci_dev *pdev) { return PCI_D3hot; @@ -52,6 +57,7 @@ static bool mid_pci_need_resume(struct pci_dev *dev) static struct pci_platform_pm_ops mid_pci_platform_pm = { .is_manageable = mid_pci_power_manageable, .set_state = mid_pci_set_power_state, + .get_state = mid_pci_get_power_state, .choose_state = mid_pci_choose_state, .sleep_wake = mid_pci_sleep_wake, .run_wake = mid_pci_run_wake, |
