Message ID | 20170127111344.32646-1-colin.king@canonical.com |
---|---|
State | New |
Headers | show |
Just minor: would that not be UBUNTU: SAUCE like the Xenial one? Since its not, yet, upstream.
On 30/01/17 10:45, Stefan Bader wrote: > Just minor: would that not be UBUNTU: SAUCE like the Xenial one? Since its not, > yet, upstream. > > > Probably, however, it's now baking in linux-next: commit ed9ab4287f96e66340e0390e2c583f2f9110cba0 Author: Colin Ian King <colin.king@canonical.com> Date: Thu Jan 26 17:34:40 2017 +0000
Applied to yakkety master-next branch. As it has gone into mainline, I added the upstream commit ID and the upstream sign-offs. Thanks. Cascardo.
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index e348865..45317d3 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -76,6 +76,9 @@ #define USB_VENDOR_ID_ALPS_JP 0x044E #define HID_DEVICE_ID_ALPS_U1_DUAL 0x120B +#define USB_VENDOR_ID_AMI 0x046b +#define USB_DEVICE_ID_AMI_VIRT_KEYBOARD_AND_MOUSE 0xff10 + #define USB_VENDOR_ID_ANTON 0x1130 #define USB_DEVICE_ID_ANTON_TOUCH_PAD 0x3101 diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index 37d17f7..d6847a6 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c @@ -57,6 +57,7 @@ static const struct hid_blacklist { { USB_VENDOR_ID_AIREN, USB_DEVICE_ID_AIREN_SLIMPLUS, HID_QUIRK_NOGET }, { USB_VENDOR_ID_AKAI, USB_DEVICE_ID_AKAI_MPKMINI2, HID_QUIRK_NO_INIT_REPORTS }, { USB_VENDOR_ID_AKAI_09E8, USB_DEVICE_ID_AKAI_09E8_MIDIMIX, HID_QUIRK_NO_INIT_REPORTS }, + { USB_VENDOR_ID_AMI, USB_DEVICE_ID_AMI_VIRT_KEYBOARD_AND_MOUSE, HID_QUIRK_ALWAYS_POLL }, { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_UC100KM, HID_QUIRK_NOGET }, { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_CS124U, HID_QUIRK_NOGET }, { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_2PORTKVM, HID_QUIRK_NOGET },