]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
HID: alps: pass correct sizes to hid_hw_raw_request()
authorJiri Kosina <jkosina@suse.cz>
Fri, 26 Aug 2016 09:19:36 +0000 (17:19 +0800)
committerTim Gardner <tim.gardner@canonical.com>
Mon, 29 Aug 2016 16:24:30 +0000 (10:24 -0600)
Calculating size of the report as sizeof(pointer) always passess the length
corresponding to the pointer type, not the underlying data report.

BugLink: https://bugs.launchpad.net/bugs/1616813
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
(cherry picked from commit 63b3a7d0f933ebf25961e602c2eb11d658fef912)
Signed-off-by: Ying-Chun Liu (PaulLiu) <paul.liu@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
drivers/hid/hid-alps.c

index 098bce621c6c9dddedcb1f82f40cec6168e96d45..ff64c92906a69bb7d014d844a34c83817825aad5 100644 (file)
@@ -136,7 +136,8 @@ static int u1_read_write_register(struct hid_device *hdev, u32 address,
 
        input[7] = check_sum;
        ret = hid_hw_raw_request(hdev, U1_FEATURE_REPORT_ID, input,
-                       sizeof(input), HID_FEATURE_REPORT, HID_REQ_SET_REPORT);
+                       sizeof(u8)*U1_FEATURE_REPORT_LEN, HID_FEATURE_REPORT,
+                       HID_REQ_SET_REPORT);
 
        if (ret < 0) {
                dev_err(&hdev->dev, "failed to read command (%d)\n", ret);
@@ -145,8 +146,8 @@ static int u1_read_write_register(struct hid_device *hdev, u32 address,
 
        if (read_flag) {
                ret = hid_hw_raw_request(hdev, U1_FEATURE_REPORT_ID, readbuf,
-                               sizeof(readbuf), HID_FEATURE_REPORT,
-                               HID_REQ_GET_REPORT);
+                               sizeof(u8)*U1_FEATURE_REPORT_LEN,
+                               HID_FEATURE_REPORT, HID_REQ_GET_REPORT);
 
                if (ret < 0) {
                        dev_err(&hdev->dev, "failed read register (%d)\n", ret);