diff options
author | Kevin Hilman <khilman@linaro.org> | 2015-10-13 16:31:57 -0700 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2015-10-13 16:31:57 -0700 |
commit | 2b090d9432eb704e3d718a0a05a3d62437b1863f (patch) | |
tree | 35baef756aa643f04a3a6af7aa97ad5d7ec6177a /drivers/hid/usbhid/hid-quirks.c | |
parent | 1f18cad529990d6637c6b7f49f79a4c3928ccf05 (diff) | |
parent | ac6d8ef9174fc00b7ea3ff2474fc57f531d312c2 (diff) |
Merge tag 'v3.18.22' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-linaro-lsk-v3.18
Linux 3.18.22
* tag 'v3.18.22' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable: (178 commits)
Linux 3.18.22
net: call rcu_read_lock early in process_backlog
lpfc: Fix scsi prep dma buf error.
rds: fix an integer overflow test in rds_info_getsockopt()
net/mlx4_core: Fix wrong index in propagating port change event to VFs
netlink: don't hold mutex in rcu callback when releasing mmapd ring
inet: frags: fix defragmented packet's IP header for af_packet
bonding: correct the MAC address for "follow" fail_over_mac policy
bonding: fix destruction of bond with devices different from arphrd_ether
ipv6: lock socket in ip6_datagram_connect()
isdn/gigaset: reset tty->receive_room when attaching ser_gigaset
bridge: mdb: fix double add notification
net: Fix skb csum races when peeking
net: do not process device backlog during unregistration
net: pktgen: fix race between pktgen_thread_worker() and kthread_stop()
bridge: mdb: zero out the local br_ip variable before use
net/tipc: initialize security state for new connection socket
ip_tunnel: fix ipv4 pmtu check to honor inner ip header df
net: graceful exit from netif_alloc_netdev_queues()
ipv6: Make MLD packets to only be processed locally
...
Diffstat (limited to 'drivers/hid/usbhid/hid-quirks.c')
-rw-r--r-- | drivers/hid/usbhid/hid-quirks.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index 509dee2e9b72..a4d1fe64c925 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c @@ -69,6 +69,7 @@ static const struct hid_blacklist { { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_PRO_PEDALS, HID_QUIRK_NOGET }, { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_3AXIS_5BUTTON_STICK, HID_QUIRK_NOGET }, { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_AXIS_295, HID_QUIRK_NOGET }, + { USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE, HID_QUIRK_ALWAYS_POLL }, { USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET }, { USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN, HID_QUIRK_ALWAYS_POLL }, { USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_009B, HID_QUIRK_ALWAYS_POLL }, |