From: Jiri Kosina <jkosina@suse.cz>
Date: Fri, 6 Sep 2013 09:59:53 +0000 (+0200)
Subject: Merge branch 'for-3.12/sensor-hub' into for-linus
X-Git-Tag: v3.12-rc1~125^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=4e5a494e4b4ba7e6aa1a8a285e98e3665fcb396e;p=linux.git

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

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

4e5a494e4b4ba7e6aa1a8a285e98e3665fcb396e
diff --cc drivers/hid/hid-sensor-hub.c
index 6fca30eb377d,e46e0134b0f9..10e1581022cf
--- a/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;
  	}