diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2026-07-03 20:28:08 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2026-07-03 20:28:08 +0200 |
| commit | 973772c7cf647cf4da6badd86c484f9b350eea18 (patch) | |
| tree | 1189820bec0019f64c1ea58b976909d840aa8af2 | |
| parent | 9825cf2cb59fac7480e7fac9eee13ab9af3f1ea8 (diff) | |
| parent | 8522d806d84e2c3816c275ae6dd79e124c1b3dac (diff) | |
| download | linux-2.6-973772c7cf647cf4da6badd86c484f9b350eea18.tar.gz linux-2.6-973772c7cf647cf4da6badd86c484f9b350eea18.zip | |
Merge branch 'acpi-tad'
Merge an ACPI TAD (Time and Alarm Device) driver fix for 7.2-rc2.
* acpi-tad:
ACPI: TAD: Check AC wake capability before enabling wakeup
| -rw-r--r-- | drivers/acpi/acpi_tad.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpi_tad.c b/drivers/acpi/acpi_tad.c index 386fc1abcbdc..fc43df083738 100644 --- a/drivers/acpi/acpi_tad.c +++ b/drivers/acpi/acpi_tad.c @@ -856,7 +856,7 @@ static int acpi_tad_probe(struct platform_device *pdev) * runtime suspend. Everything else should be taken care of by the ACPI * PM domain callbacks. */ - if (ACPI_TAD_AC_WAKE) { + if (caps & ACPI_TAD_AC_WAKE) { device_init_wakeup(dev, true); dev_pm_set_driver_flags(dev, DPM_FLAG_SMART_SUSPEND | DPM_FLAG_MAY_SKIP_RESUME); |