lkml.org 
[lkml]   [2018]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 058/164] HID: Fix hid_report_len usage
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

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

    From: Aaron Ma <aaron.ma@canonical.com>

    commit 3064a03b94e60388f0955fcc29f3e8a978d28f75 upstream.

    Follow the change of return type u32 of hid_report_len,
    fix all the types of variables those get the return value of
    hid_report_len to u32, and all other code already uses u32.

    Cc: stable@vger.kernel.org
    Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/hid/hid-input.c | 3 ++-
    drivers/hid/hid-multitouch.c | 5 +++--
    drivers/hid/hid-rmi.c | 4 ++--
    drivers/hid/wacom_sys.c | 4 ++--
    4 files changed, 9 insertions(+), 7 deletions(-)

    --- a/drivers/hid/hid-input.c
    +++ b/drivers/hid/hid-input.c
    @@ -1359,7 +1359,8 @@ static void hidinput_led_worker(struct w
    led_work);
    struct hid_field *field;
    struct hid_report *report;
    - int len, ret;
    + int ret;
    + u32 len;
    __u8 *buf;

    field = hidinput_get_led_field(hid);
    --- a/drivers/hid/hid-multitouch.c
    +++ b/drivers/hid/hid-multitouch.c
    @@ -354,7 +354,8 @@ static const struct attribute_group mt_a
    static void mt_get_feature(struct hid_device *hdev, struct hid_report *report)
    {
    struct mt_device *td = hid_get_drvdata(hdev);
    - int ret, size = hid_report_len(report);
    + int ret;
    + u32 size = hid_report_len(report);
    u8 *buf;

    /*
    @@ -1049,7 +1050,7 @@ static void mt_set_input_mode(struct hid
    struct hid_report_enum *re;
    struct mt_class *cls = &td->mtclass;
    char *buf;
    - int report_len;
    + u32 report_len;

    if (td->inputmode < 0)
    return;
    --- a/drivers/hid/hid-rmi.c
    +++ b/drivers/hid/hid-rmi.c
    @@ -89,8 +89,8 @@ struct rmi_data {
    u8 *writeReport;
    u8 *readReport;

    - int input_report_size;
    - int output_report_size;
    + u32 input_report_size;
    + u32 output_report_size;

    unsigned long flags;

    --- a/drivers/hid/wacom_sys.c
    +++ b/drivers/hid/wacom_sys.c
    @@ -115,7 +115,7 @@ static void wacom_feature_mapping(struct
    unsigned int equivalent_usage = wacom_equivalent_usage(usage->hid);
    u8 *data;
    int ret;
    - int n;
    + u32 n;

    switch (equivalent_usage) {
    case HID_DG_CONTACTMAX:
    @@ -408,7 +408,7 @@ static int wacom_set_device_mode(struct
    u8 *rep_data;
    struct hid_report *r;
    struct hid_report_enum *re;
    - int length;
    + u32 length;
    int error = -ENOMEM, limit = 0;

    if (wacom_wac->mode_report < 0)

    \
     
     \ /
      Last update: 2018-04-22 17:32    [W:4.135 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site