lkml.org 
[lkml]   [2018]   [Sep]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.18 196/197] HID: redragon: fix num lock and caps lock LEDs
    Date
    4.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Robert Munteanu <rombert@apache.org>

    commit dc9b8e85ed95cbe7e3ad0eabb5b48d617bbc365e upstream.

    The redragon asura keyboard registers two input devices. The initial commit
    85455dd906d5 ("HID: redragon: Fix modifier keys for Redragon Asura Keyboard")
    considered this an error and prevented one of the devices from registering.
    However, once this is done the num lock and caps lock leds no longer toggle on
    and off, although the key functionality is not affected.

    This commit removes the code that prevents the input device
    registration and restores the num lock and caps lock LEDs.

    Fixes: 85455dd906d5 ("HID: redragon: Fix modifier keys for Redragon Asura Keyboard")
    Signed-off-by: Robert Munteanu <rombert@apache.org>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/hid/hid-redragon.c | 26 +-------------------------
    1 file changed, 1 insertion(+), 25 deletions(-)

    --- a/drivers/hid/hid-redragon.c
    +++ b/drivers/hid/hid-redragon.c
    @@ -44,29 +44,6 @@ static __u8 *redragon_report_fixup(struc
    return rdesc;
    }

    -static int redragon_probe(struct hid_device *dev,
    - const struct hid_device_id *id)
    -{
    - int ret;
    -
    - ret = hid_parse(dev);
    - if (ret) {
    - hid_err(dev, "parse failed\n");
    - return ret;
    - }
    -
    - /* do not register unused input device */
    - if (dev->maxapplication == 1)
    - return 0;
    -
    - ret = hid_hw_start(dev, HID_CONNECT_DEFAULT);
    - if (ret) {
    - hid_err(dev, "hw start failed\n");
    - return ret;
    - }
    -
    - return 0;
    -}
    static const struct hid_device_id redragon_devices[] = {
    {HID_USB_DEVICE(USB_VENDOR_ID_JESS, USB_DEVICE_ID_REDRAGON_ASURA)},
    {}
    @@ -77,8 +54,7 @@ MODULE_DEVICE_TABLE(hid, redragon_device
    static struct hid_driver redragon_driver = {
    .name = "redragon",
    .id_table = redragon_devices,
    - .report_fixup = redragon_report_fixup,
    - .probe = redragon_probe
    + .report_fixup = redragon_report_fixup
    };

    module_hid_driver(redragon_driver);

    \
     
     \ /
      Last update: 2018-09-13 16:08    [W:4.095 / U:0.364 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site