Skip to content

Commit 973772c

Browse files
committed
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
2 parents 9825cf2 + 8522d80 commit 973772c

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/acpi/acpi_tad.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,7 @@ static int acpi_tad_probe(struct platform_device *pdev)
856856
* runtime suspend. Everything else should be taken care of by the ACPI
857857
* PM domain callbacks.
858858
*/
859-
if (ACPI_TAD_AC_WAKE) {
859+
if (caps & ACPI_TAD_AC_WAKE) {
860860
device_init_wakeup(dev, true);
861861
dev_pm_set_driver_flags(dev, DPM_FLAG_SMART_SUSPEND |
862862
DPM_FLAG_MAY_SKIP_RESUME);

0 commit comments

Comments
 (0)