diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2017-01-17 12:44:14 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2017-01-17 12:44:14 -0800 |
| commit | f103e3b0d8e462a747c53fc5a7ac3981ef1e8f3f (patch) | |
| tree | 2fcb1d356e096ae0b0c047abebfaa0424223595e /drivers/hid | |
| parent | 82a6fedb6ea53c9f3eb00ab1e0b839d3fcfe5fc2 (diff) | |
| parent | d9ea51a9bea4ed29f8fd9c59a8122c7aabcc5562 (diff) | |
Merge tag 'v4.4.43' into android-4.4.y
This is the 4.4.43 stable release
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-cypress.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hid/hid-cypress.c b/drivers/hid/hid-cypress.c index 1b764d1745f3..1689568b597d 100644 --- a/drivers/hid/hid-cypress.c +++ b/drivers/hid/hid-cypress.c @@ -39,6 +39,9 @@ static __u8 *cp_report_fixup(struct hid_device *hdev, __u8 *rdesc, if (!(quirks & CP_RDESC_SWAPPED_MIN_MAX)) return rdesc; + if (*rsize < 4) + return rdesc; + for (i = 0; i < *rsize - 4; i++) if (rdesc[i] == 0x29 && rdesc[i + 2] == 0x19) { rdesc[i] = 0x19; |