Skip to content

Commit

Permalink
HID: sensor-hub: Move the memset to sensor_hub_get_feature()
Browse files Browse the repository at this point in the history
While applying patch d443a0a: "HID: hid-sensor-hub: clear memory to
avoid random data", there was some issues in applying correct version of
the patch. This resulted in the breakage of sensor functions as all
request like power-up will be reset by the memset() in the function
sensor_hub_set_feature().
The reset of caller buffer should be in the function
sensor_hub_get_feature(), not in the sensor_hub_set_feature().

Fixes: d443a0a ("HID: hid-sensor-hub: clear memory to avoid random data")
Cc: Stable <[email protected]> # 4.9+
Signed-off-by: Srinivas Pandruvada <[email protected]>
Signed-off-by: Jiri Kosina <[email protected]>
  • Loading branch information
spandruvada authored and Jiri Kosina committed Jan 2, 2017
1 parent 8aa2cc7 commit 143fca7
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/hid/hid-sensor-hub.c
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,6 @@ int sensor_hub_set_feature(struct hid_sensor_hub_device *hsdev, u32 report_id,
__s32 value;
int ret = 0;

memset(buffer, 0, buffer_size);
mutex_lock(&data->mutex);
report = sensor_hub_report(report_id, hsdev->hdev, HID_FEATURE_REPORT);
if (!report || (field_index >= report->maxfield)) {
Expand Down Expand Up @@ -256,6 +255,8 @@ int sensor_hub_get_feature(struct hid_sensor_hub_device *hsdev, u32 report_id,
int buffer_index = 0;
int i;

memset(buffer, 0, buffer_size);

mutex_lock(&data->mutex);
report = sensor_hub_report(report_id, hsdev->hdev, HID_FEATURE_REPORT);
if (!report || (field_index >= report->maxfield) ||
Expand Down

0 comments on commit 143fca7

Please sign in to comment.