diff options
Diffstat (limited to 'drivers/hid')
-rw-r--r-- | drivers/hid/hid-core.c | 1 | ||||
-rw-r--r-- | drivers/hid/hid-cypress.c | 2 | ||||
-rw-r--r-- | drivers/hid/hid-ids.h | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 7d05c4bb201e..e2e8741fdb53 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
@@ -1294,6 +1294,7 @@ static const struct hid_device_id hid_blacklist[] = { | |||
1294 | { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) }, | 1294 | { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) }, |
1295 | { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) }, | 1295 | { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) }, |
1296 | { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2) }, | 1296 | { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2) }, |
1297 | { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_3) }, | ||
1297 | { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE) }, | 1298 | { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE) }, |
1298 | { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0006) }, | 1299 | { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0006) }, |
1299 | { HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) }, | 1300 | { HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) }, |
diff --git a/drivers/hid/hid-cypress.c b/drivers/hid/hid-cypress.c index 62e9cb10e88c..998b6f443d7d 100644 --- a/drivers/hid/hid-cypress.c +++ b/drivers/hid/hid-cypress.c | |||
@@ -126,6 +126,8 @@ static const struct hid_device_id cp_devices[] = { | |||
126 | .driver_data = CP_RDESC_SWAPPED_MIN_MAX }, | 126 | .driver_data = CP_RDESC_SWAPPED_MIN_MAX }, |
127 | { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2), | 127 | { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2), |
128 | .driver_data = CP_RDESC_SWAPPED_MIN_MAX }, | 128 | .driver_data = CP_RDESC_SWAPPED_MIN_MAX }, |
129 | { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_3), | ||
130 | .driver_data = CP_RDESC_SWAPPED_MIN_MAX }, | ||
129 | { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE), | 131 | { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE), |
130 | .driver_data = CP_2WHEEL_MOUSE_HACK }, | 132 | .driver_data = CP_2WHEEL_MOUSE_HACK }, |
131 | { } | 133 | { } |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index adbef5d069c4..656c015cf790 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -145,6 +145,7 @@ | |||
145 | #define USB_DEVICE_ID_CYPRESS_ULTRAMOUSE 0x7417 | 145 | #define USB_DEVICE_ID_CYPRESS_ULTRAMOUSE 0x7417 |
146 | #define USB_DEVICE_ID_CYPRESS_BARCODE_1 0xde61 | 146 | #define USB_DEVICE_ID_CYPRESS_BARCODE_1 0xde61 |
147 | #define USB_DEVICE_ID_CYPRESS_BARCODE_2 0xde64 | 147 | #define USB_DEVICE_ID_CYPRESS_BARCODE_2 0xde64 |
148 | #define USB_DEVICE_ID_CYPRESS_BARCODE_3 0xbca1 | ||
148 | 149 | ||
149 | #define USB_VENDOR_ID_DEALEXTREAME 0x10c5 | 150 | #define USB_VENDOR_ID_DEALEXTREAME 0x10c5 |
150 | #define USB_DEVICE_ID_DEALEXTREAME_RADIO_SI4701 0x819a | 151 | #define USB_DEVICE_ID_DEALEXTREAME_RADIO_SI4701 0x819a |