lkml.org 
[lkml]   [2020]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.6 107/606] HID: alps: ALPS_1657 is too specific; use U1_UNICORN_LEGACY instead
    Date
    From: Jiri Kosina <jkosina@suse.cz>

    [ 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: Xiaojian Cao <xiaojian.cao@cn.alps.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/hid/hid-alps.c | 2 +-
    drivers/hid/hid-ids.h | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/hid/hid-alps.c b/drivers/hid/hid-alps.c
    index c2a2bd528890..b2ad319a74b9 100644
    --- a/drivers/hid/hid-alps.c
    +++ b/drivers/hid/hid-alps.c
    @@ -802,7 +802,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:
    diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
    index 7d769ca864a7..b3cc26ca375f 100644
    --- a/drivers/hid/hid-ids.h
    +++ b/drivers/hid/hid-ids.h
    @@ -79,9 +79,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
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-09 01:18    [W:3.540 / U:0.380 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site