Skip to content

Commit d64a6e4

Browse files
spbnickJiri Kosina
authored andcommitted
HID: uclogic: Pass keyboard reports as is
Allow keyboard reports from interface #1 of Huion tablets to pass unmodified, and stop the Wacom X.org driver from handling them. The method for the latter is rather crude and also take the Dial reports from the Wacom driver, but it's expected that libinput will be able to handle them (still to be tested). This enables Huion HS611 media and desktop keys. Signed-off-by: Nikolai Kondrashov <spbnick@gmail.com> Signed-off-by: José Expósito <jose.exposito89@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
1 parent 4933a72 commit d64a6e4

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

drivers/hid/hid-uclogic-params.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -711,8 +711,12 @@ static int uclogic_params_huion_init(struct uclogic_params *params,
711711
iface = to_usb_interface(hdev->dev.parent);
712712
bInterfaceNumber = iface->cur_altsetting->desc.bInterfaceNumber;
713713

714-
/* If it's not a pen interface */
715-
if (bInterfaceNumber != 0) {
714+
/* If it's a custom keyboard interface */
715+
if (bInterfaceNumber == 1) {
716+
/* Keep everything intact */
717+
goto output;
718+
/* Else, if it's not a pen interface */
719+
} else if (bInterfaceNumber != 0) {
716720
uclogic_params_init_invalid(&p);
717721
goto output;
718722
}

0 commit comments

Comments
 (0)