Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10c03403 authored by Jiri Kosina's avatar Jiri Kosina Committed by Greg Kroah-Hartman
Browse files

HID: alps: ALPS_1657 is too specific; use U1_UNICORN_LEGACY instead 



[ Upstream commit 185af3e775b693f773d9a4b5a8c3cda69fc8ca0f ]

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: 640e403b1fd24 ("HID: alps: Add AUI1657 device ID")
Reported-by: default avatarXiaojian Cao <xiaojian.cao@cn.alps.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent afdc3083

drivers/hid/hid-alps.c

+1 −1
Original line number Diff line number Diff line
@@ -806,7 +806,7 @@ static int alps_probe(struct hid_device *hdev, const struct hid_device_id *id) 
		break;

	case HID_DEVICE_ID_ALPS_U1_DUAL:

	case HID_DEVICE_ID_ALPS_U1:

	case HID_DEVICE_ID_ALPS_1657:

	case HID_DEVICE_ID_ALPS_U1_UNICORN_LEGACY:

		data->dev_type = U1;

		break;

	default:

drivers/hid/hid-ids.h

+1 −1
Original line number Diff line number Diff line
@@ -81,9 +81,9 @@ 
#define HID_DEVICE_ID_ALPS_U1_DUAL_PTP	0x121F

#define HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP	0x1220

#define HID_DEVICE_ID_ALPS_U1		0x1215

#define HID_DEVICE_ID_ALPS_U1_UNICORN_LEGACY         0x121E

#define HID_DEVICE_ID_ALPS_T4_BTNLESS	0x120C

#define HID_DEVICE_ID_ALPS_1222		0x1222

#define HID_DEVICE_ID_ALPS_1657         0x121E



#define USB_VENDOR_ID_AMI		0x046b

#define USB_DEVICE_ID_AMI_VIRT_KEYBOARD_AND_MOUSE	0xff10