Skip to content

Import wacom_wac upstream patches #472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
flying-elephant wants to merge 3 commits into from
Closed

Import wacom_wac upstream patches #472

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5430692
Import wacom_wac upstream patch(treewide, timers: Rename
flying-elephant Nov 4, 2025
5f1d69a
HID: wacom: Add a new Art Pen 2
flying-elephant Nov 4, 2025
c40a498
Fix preprocessor directive syntax for kernel version check
flying-elephant Nov 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions 4.18/wacom_wac.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,11 @@

void wacom_idleprox_timeout(struct timer_list *list)
{
#if LINUX_VERSION_CODE < KERNEL_VERSION(6,16,0)

Check failure on line 78 in 4.18/wacom_wac.c

View workflow job for this annotation

GitHub Actions / checkpatch 

WARNING: LINUX_VERSION_CODE should be avoided, code should be for the version to which it is merged

Check failure on line 78 in 4.18/wacom_wac.c

View workflow job for this annotation

GitHub Actions / checkpatch 

WARNING: Comparisons should place the constant on the right side of the test

Check failure on line 78 in 4.18/wacom_wac.c

View workflow job for this annotation

GitHub Actions / checkpatch 

ERROR: space required after that ',' (ctx:VxV)

Check failure on line 78 in 4.18/wacom_wac.c

View workflow job for this annotation

GitHub Actions / checkpatch 

ERROR: space required after that ',' (ctx:VxV)

Check failure on line 78 in 4.18/wacom_wac.c

View workflow job for this annotation

GitHub Actions / checkpatch 

WARNING: LINUX_VERSION_CODE should be avoided, code should be for the version to which it is merged

Check failure on line 78 in 4.18/wacom_wac.c

View workflow job for this annotation

GitHub Actions / checkpatch 

ERROR: trailing whitespace
struct wacom *wacom = from_timer(wacom, list, idleprox_timer);
#else
struct wacom *wacom = timer_container_of(wacom, list, idleprox_timer);
#endif
struct wacom_wac *wacom_wac = &wacom->wacom_wac;

if (!wacom_wac->hid_data.sense_state) {
Expand Down Expand Up @@ -696,6 +700,7 @@
case 0x885: /* Intuos3 Marker Pen */
case 0x804: /* Intuos4/5 13HD/24HD Marker Pen */
case 0x10804: /* Intuos4/5 13HD/24HD Art Pen */
case 0x204: /* Art Pen 2 */
is_art_pen = true;
break;
}
Expand Down
Loading