diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2021-02-23 11:43:27 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2021-02-23 11:43:27 +0100 |
| commit | 00522de2f9f184946d5c4384100f48270f88c45d (patch) | |
| tree | 6b0d16151c7a37740f1a0b5c3963a1506b9a9994 /drivers/hid/hid-uclogic-params.c | |
| parent | c35f31fc066c8f43bfcd74aab9ffbc454a5b9336 (diff) | |
| parent | f7271b2a697d2549db7aa60e0a8e0afeb852faa5 (diff) | |
Merge branch 'for-5.12/uclogic' into for-linus
- Trust Panora support improvements from Cristian Klein
Diffstat (limited to 'drivers/hid/hid-uclogic-params.c')
| -rw-r--r-- | drivers/hid/hid-uclogic-params.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hid/hid-uclogic-params.c b/drivers/hid/hid-uclogic-params.c index 56406cee401f..6af25c38b9cc 100644 --- a/drivers/hid/hid-uclogic-params.c +++ b/drivers/hid/hid-uclogic-params.c @@ -1045,6 +1045,8 @@ int uclogic_params_init(struct uclogic_params *params, uclogic_params_init_with_pen_unused(&p); } break; + case VID_PID(USB_VENDOR_ID_TRUST, + USB_DEVICE_ID_TRUST_PANORA_TABLET): case VID_PID(USB_VENDOR_ID_UGEE, USB_DEVICE_ID_UGEE_TABLET_G5): /* Ignore non-pen interfaces */ |