From: David McFarland <corngood@gmail.com>
To: platform-driver-x86@vger.kernel.org
Cc: David McFarland <corngood@gmail.com>
Subject: [PATCH v2] platform/x86/intel: disable wakeup_mode during hibernation
Date: Tue, 20 Jan 2026 12:10:54 -0400 [thread overview]
Message-ID: <20260120161100.29342-2-corngood@gmail.com> (raw)
In-Reply-To: <20260120141758.3496-1-corngood@gmail.com>
Without this change I get the problem described in the linked bug:
> Wakeup event detected during hibernation, rolling back
The docs for the 'freeze' event say:
> Analogous to @suspend(), but it should not enable the device to signal wakeup
> events or change its power state.
I've been running with this change for several months on my Dell
Precision 3680. I haven't tested on any other systems.
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218634
---
v1 -> v2: fixed bugzilla link
drivers/platform/x86/intel/hid.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/platform/x86/intel/hid.c b/drivers/platform/x86/intel/hid.c
index 560cc063198e..3a9561665b9b 100644
--- a/drivers/platform/x86/intel/hid.c
+++ b/drivers/platform/x86/intel/hid.c
@@ -419,6 +419,14 @@ static int intel_hid_pl_suspend_handler(struct device *device)
return 0;
}
+static int intel_hid_pl_freeze_handler(struct device *device)
+{
+ struct intel_hid_priv *priv = dev_get_drvdata(device);
+
+ priv->wakeup_mode = false;
+ return intel_hid_pl_suspend_handler(device);
+}
+
static int intel_hid_pl_resume_handler(struct device *device)
{
intel_hid_pm_complete(device);
@@ -433,7 +441,7 @@ static int intel_hid_pl_resume_handler(struct device *device)
static const struct dev_pm_ops intel_hid_pl_pm_ops = {
.prepare = intel_hid_pm_prepare,
.complete = intel_hid_pm_complete,
- .freeze = intel_hid_pl_suspend_handler,
+ .freeze = intel_hid_pl_freeze_handler,
.thaw = intel_hid_pl_resume_handler,
.restore = intel_hid_pl_resume_handler,
.suspend = intel_hid_pl_suspend_handler,
--
2.52.0
next prev parent reply other threads:[~2026-01-20 16:15 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-20 14:17 [PATCH] platform/x86/intel: disable wakeup_mode during hibernation David McFarland
2026-01-20 16:10 ` David McFarland [this message]
2026-01-22 15:46 ` [PATCH v2] " David McFarland
2026-01-29 12:25 ` Ilpo Järvinen
2026-02-05 23:16 ` [PATCH v3] " David McFarland
2026-03-17 13:01 ` Ilpo Järvinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260120161100.29342-2-corngood@gmail.com \
--to=corngood@gmail.com \
--cc=platform-driver-x86@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox