Skip to content

Commit 185af3e

Browse files
author
Jiri Kosina
committed
HID: alps: ALPS_1657 is too specific; use U1_UNICORN_LEGACY instead
HID_DEVICE_ID_ALPS_1657 PID is too specific, as there are many other ALPS hardware IDs using this particular touchpad. Rename the identifier to HID_DEVICE_ID_ALPS_U1_UNICORN_LEGACY in order to describe reality better. Fixes: 640e403 ("HID: alps: Add AUI1657 device ID") Reported-by: Xiaojian Cao <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
1 parent 640e403 commit 185af3e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

drivers/hid/hid-alps.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -802,7 +802,7 @@ static int alps_probe(struct hid_device *hdev, const struct hid_device_id *id)
802802
break;
803803
case HID_DEVICE_ID_ALPS_U1_DUAL:
804804
case HID_DEVICE_ID_ALPS_U1:
805-
case HID_DEVICE_ID_ALPS_1657:
805+
case HID_DEVICE_ID_ALPS_U1_UNICORN_LEGACY:
806806
data->dev_type = U1;
807807
break;
808808
default:

drivers/hid/hid-ids.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@
7979
#define HID_DEVICE_ID_ALPS_U1_DUAL_PTP 0x121F
8080
#define HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP 0x1220
8181
#define HID_DEVICE_ID_ALPS_U1 0x1215
82+
#define HID_DEVICE_ID_ALPS_U1_UNICORN_LEGACY 0x121E
8283
#define HID_DEVICE_ID_ALPS_T4_BTNLESS 0x120C
8384
#define HID_DEVICE_ID_ALPS_1222 0x1222
84-
#define HID_DEVICE_ID_ALPS_1657 0x121E
8585

8686
#define USB_VENDOR_ID_AMI 0x046b
8787
#define USB_DEVICE_ID_AMI_VIRT_KEYBOARD_AND_MOUSE 0xff10

0 commit comments

Comments
 (0)