diff options
| author | Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> | 2025-01-20 15:22:06 +0300 |
|---|---|---|
| committer | Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> | 2025-01-21 15:00:38 +0300 |
| commit | 0da9a3f9ac8ada83fa79579455871ec59f11db72 (patch) | |
| tree | 48a22c56221b8c9b3639cf132330117baf2c5181 /drivers/platform/x86/amd/pmc/pmc.c | |
| parent | 3ef4ea516c2f8a2f1ff8ca59b156fb2e4472c2a4 (diff) | |
| parent | 59616a91e5e74833b2008b56c66879857c616006 (diff) | |
| download | linux-0da9a3f9ac8ada83fa79579455871ec59f11db72.tar.xz | |
Merge branch 'fixes' into 'for-next'
Merged the 'fixes' branch into the 'for-next' branch to resolve
a conflict in alienware-wmi zone teardown code.
Diffstat (limited to 'drivers/platform/x86/amd/pmc/pmc.c')
| -rw-r--r-- | drivers/platform/x86/amd/pmc/pmc.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/platform/x86/amd/pmc/pmc.c b/drivers/platform/x86/amd/pmc/pmc.c index 60a22fb65eee..9fc0bb61d995 100644 --- a/drivers/platform/x86/amd/pmc/pmc.c +++ b/drivers/platform/x86/amd/pmc/pmc.c @@ -778,6 +778,10 @@ static int amd_pmc_suspend_handler(struct device *dev) { struct amd_pmc_dev *pdev = dev_get_drvdata(dev); + /* + * Must be called only from the same set of dev_pm_ops handlers + * as i8042_pm_suspend() is called: currently just from .suspend. + */ if (pdev->disable_8042_wakeup && !disable_workarounds) { int rc = amd_pmc_wa_irq1(pdev); @@ -790,7 +794,9 @@ static int amd_pmc_suspend_handler(struct device *dev) return 0; } -static DEFINE_SIMPLE_DEV_PM_OPS(amd_pmc_pm, amd_pmc_suspend_handler, NULL); +static const struct dev_pm_ops amd_pmc_pm = { + .suspend = amd_pmc_suspend_handler, +}; static const struct pci_device_id pmc_pci_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_PS) }, |