1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c
index ca7498107327..6fca30eb377d 100644
--- a/drivers/hid/hid-sensor-hub.c
+++ b/drivers/hid/hid-sensor-hub.c
@@ -221,7 +221,8 @@ int sensor_hub_get_feature(struct hid_sensor_hub_device *hsdev, u32 report_id,
 
         mutex_lock(&data->mutex);
         report = sensor_hub_report(report_id, hsdev->hdev, HID_FEATURE_REPORT);
-        if (!report || (field_index >=  report->maxfield)) {
+        if (!report || (field_index >=  report->maxfield) ||
+            report->field[field_index]->report_count < 1) {
                 ret = -EINVAL;
                 goto done_proc;
         }
@@ -416,7 +417,7 @@ static int sensor_hub_raw_event(struct hid_device *hdev,
                 return 1;
 
         ptr = raw_data;
-        ptr++; /*Skip report id*/
+        ptr++; /* Skip report id */
 
         spin_lock_irqsave(&pdata->lock, flags);