| Message ID | 20210415185232.2617398-1-srinivas.pandruvada@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] HID: hid-sensor-hub: Return error for hid_set_field() failure | expand |
On Thu, 15 Apr 2021 11:52:31 -0700 Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> wrote: > In the function sensor_hub_set_feature(), return error when hid_set_field() > fails. > > Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Series applied to the to greg branch of iio.git. Note these won't make the coming merge window, so will turn up in next sometime after rc1. thanks, Jonathan > --- > drivers/hid/hid-sensor-hub.c | 13 +++++++++---- > 1 file changed, 9 insertions(+), 4 deletions(-) > > diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c > index 3dd7d3246737..f9983145d4e7 100644 > --- a/drivers/hid/hid-sensor-hub.c > +++ b/drivers/hid/hid-sensor-hub.c > @@ -210,16 +210,21 @@ int sensor_hub_set_feature(struct hid_sensor_hub_device *hsdev, u32 report_id, > buffer_size = buffer_size / sizeof(__s32); > if (buffer_size) { > for (i = 0; i < buffer_size; ++i) { > - hid_set_field(report->field[field_index], i, > - (__force __s32)cpu_to_le32(*buf32)); > + ret = hid_set_field(report->field[field_index], i, > + (__force __s32)cpu_to_le32(*buf32)); > + if (ret) > + goto done_proc; > + > ++buf32; > } > } > if (remaining_bytes) { > value = 0; > memcpy(&value, (u8 *)buf32, remaining_bytes); > - hid_set_field(report->field[field_index], i, > - (__force __s32)cpu_to_le32(value)); > + ret = hid_set_field(report->field[field_index], i, > + (__force __s32)cpu_to_le32(value)); > + if (ret) > + goto done_proc; > } > hid_hw_request(hsdev->hdev, report, HID_REQ_SET_REPORT); > hid_hw_wait(hsdev->hdev);
On Sun, 18 Apr 2021 12:12:44 +0100 Jonathan Cameron <jic23@kernel.org> wrote: > On Thu, 15 Apr 2021 11:52:31 -0700 > Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> wrote: > > > In the function sensor_hub_set_feature(), return error when hid_set_field() > > fails. > > > > Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> > Series applied to the to greg branch of iio.git. Note these won't make the > coming merge window, so will turn up in next sometime after rc1. And dropped again. Not enough caffeine today. Not in IIO obviously so instead: Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> for both patches. > > thanks, > > Jonathan > > > --- > > drivers/hid/hid-sensor-hub.c | 13 +++++++++---- > > 1 file changed, 9 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c > > index 3dd7d3246737..f9983145d4e7 100644 > > --- a/drivers/hid/hid-sensor-hub.c > > +++ b/drivers/hid/hid-sensor-hub.c > > @@ -210,16 +210,21 @@ int sensor_hub_set_feature(struct hid_sensor_hub_device *hsdev, u32 report_id, > > buffer_size = buffer_size / sizeof(__s32); > > if (buffer_size) { > > for (i = 0; i < buffer_size; ++i) { > > - hid_set_field(report->field[field_index], i, > > - (__force __s32)cpu_to_le32(*buf32)); > > + ret = hid_set_field(report->field[field_index], i, > > + (__force __s32)cpu_to_le32(*buf32)); > > + if (ret) > > + goto done_proc; > > + > > ++buf32; > > } > > } > > if (remaining_bytes) { > > value = 0; > > memcpy(&value, (u8 *)buf32, remaining_bytes); > > - hid_set_field(report->field[field_index], i, > > - (__force __s32)cpu_to_le32(value)); > > + ret = hid_set_field(report->field[field_index], i, > > + (__force __s32)cpu_to_le32(value)); > > + if (ret) > > + goto done_proc; > > } > > hid_hw_request(hsdev->hdev, report, HID_REQ_SET_REPORT); > > hid_hw_wait(hsdev->hdev); >
On Thu, 15 Apr 2021, Srinivas Pandruvada wrote: > In the function sensor_hub_set_feature(), return error when hid_set_field() > fails. > > Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Applied this one, thanks.
diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c index 3dd7d3246737..f9983145d4e7 100644 --- a/drivers/hid/hid-sensor-hub.c +++ b/drivers/hid/hid-sensor-hub.c @@ -210,16 +210,21 @@ int sensor_hub_set_feature(struct hid_sensor_hub_device *hsdev, u32 report_id, buffer_size = buffer_size / sizeof(__s32); if (buffer_size) { for (i = 0; i < buffer_size; ++i) { - hid_set_field(report->field[field_index], i, - (__force __s32)cpu_to_le32(*buf32)); + ret = hid_set_field(report->field[field_index], i, + (__force __s32)cpu_to_le32(*buf32)); + if (ret) + goto done_proc; + ++buf32; } } if (remaining_bytes) { value = 0; memcpy(&value, (u8 *)buf32, remaining_bytes); - hid_set_field(report->field[field_index], i, - (__force __s32)cpu_to_le32(value)); + ret = hid_set_field(report->field[field_index], i, + (__force __s32)cpu_to_le32(value)); + if (ret) + goto done_proc; } hid_hw_request(hsdev->hdev, report, HID_REQ_SET_REPORT); hid_hw_wait(hsdev->hdev);
In the function sensor_hub_set_feature(), return error when hid_set_field() fails. Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> --- drivers/hid/hid-sensor-hub.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)