projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
63faf15
7b0692f
)
Merge branch 'for-3.12/sensor-hub' into for-linus
author
Jiri Kosina
<jkosina@suse.cz>
Fri, 6 Sep 2013 09:59:53 +0000
(11:59 +0200)
committer
Jiri Kosina
<jkosina@suse.cz>
Fri, 6 Sep 2013 09:59:53 +0000
(11:59 +0200)
Conflicts:
drivers/hid/hid-sensor-hub.c
1
2
drivers/hid/hid-sensor-hub.c
patch
|
diff1
|
diff2
|
blob
|
history
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;
}