Merge branch 'for-3.12/sensor-hub' into for-linus

Conflicts:
	drivers/hid/hid-sensor-hub.c

diff --cc drivers/hid/hid-sensor-hub.c
index 6fca30e,e46e013..10e1581
--- 1/drivers/hid/hid-sensor-hub.c
--- 2/drivers/hid/hid-sensor-hub.c
+++ b/drivers/hid/hid-sensor-hub.c
@@@ -221,8 -220,7 +220,8 @@@ int sensor_hub_get_feature(struct hid_s
  
        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)) {
++      if (!report || (field_index >= report->maxfield) ||
 +          report->field[field_index]->report_count < 1) {
                ret = -EINVAL;
                goto done_proc;
        }