Skip to content

Commit 6e0fe1a

Browse files
committed
Fix touchbar resume
1 parent f8b46f3 commit 6e0fe1a

File tree

2 files changed

+45
-1
lines changed

2 files changed

+45
-1
lines changed

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ apt-get update
1010
apt-get install -y lsb-release
1111

1212
KERNEL_VERSION=6.19.10
13-
PKGREL=1
13+
PKGREL=2
1414
DISTRO=$(lsb_release -i | cut -d ":" -f 2 | xargs)
1515
CODENAME=$(lsb_release -c | cut -d ":" -f 2 | xargs)
1616

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
From 03ddec77e371b1da163635d59b3d9e5a12ed574f Mon Sep 17 00:00:00 2001
2+
From: Aditya Garg <gargaditya08@live.com>
3+
Date: Sat, 7 Feb 2026 18:21:29 +0530
4+
Subject: [PATCH] HID: appletb-kbd: add .resume method in PM
5+
6+
commit 1965445e13c09b79932ca8154977b4408cb9610c upstream.
7+
8+
Upon resuming from suspend, the Touch Bar driver was missing a resume
9+
method in order to restore the original mode the Touch Bar was on before
10+
suspending. It is the same as the reset_resume method.
11+
12+
Cc: stable@vger.kernel.org
13+
Signed-off-by: Aditya Garg <gargaditya08@live.com>
14+
Signed-off-by: Jiri Kosina <jkosina@suse.com>
15+
---
16+
drivers/hid/hid-appletb-kbd.c | 5 +++--
17+
1 file changed, 3 insertions(+), 2 deletions(-)
18+
19+
diff --git a/drivers/hid/hid-appletb-kbd.c b/drivers/hid/hid-appletb-kbd.c
20+
index b00687e67..0b10cff46 100644
21+
--- a/drivers/hid/hid-appletb-kbd.c
22+
+++ b/drivers/hid/hid-appletb-kbd.c
23+
@@ -477,7 +477,7 @@ static int appletb_kbd_suspend(struct hid_device *hdev, pm_message_t msg)
24+
return 0;
25+
}
26+
27+
-static int appletb_kbd_reset_resume(struct hid_device *hdev)
28+
+static int appletb_kbd_resume(struct hid_device *hdev)
29+
{
30+
struct appletb_kbd *kbd = hid_get_drvdata(hdev);
31+
32+
@@ -503,7 +503,8 @@ static struct hid_driver appletb_kbd_hid_driver = {
33+
.input_configured = appletb_kbd_input_configured,
34+
#ifdef CONFIG_PM
35+
.suspend = appletb_kbd_suspend,
36+
- .reset_resume = appletb_kbd_reset_resume,
37+
+ .resume = appletb_kbd_resume,
38+
+ .reset_resume = appletb_kbd_resume,
39+
#endif
40+
.driver.dev_groups = appletb_kbd_groups,
41+
};
42+
--
43+
2.52.0
44+

0 commit comments

Comments
 (0)