diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-09 17:16:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-09 17:16:11 -0700 |
| commit | 092150a25cb7bd6a79aa00bb1ad131063f58073d (patch) | |
| tree | bc182ea7bb8f5b83c6853ce407483a8814076e21 /drivers/hid/i2c-hid/i2c-hid.c | |
| parent | bdf33113d89f70186ffb6674e925fa9b8a0266b1 (diff) | |
| parent | 4f65245f2d178b9cba48350620d76faa4a098841 (diff) | |
| download | linux-092150a25cb7bd6a79aa00bb1ad131063f58073d.tar.gz linux-092150a25cb7bd6a79aa00bb1ad131063f58073d.tar.bz2 linux-092150a25cb7bd6a79aa00bb1ad131063f58073d.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID fixes from Jiri Kosina:
- spectrev1 pattern fix in hiddev from Gustavo A. R. Silva
- bounds check fix for hid-debug from Daniel Rosenberg
- regression fix for HID autobinding from Benjamin Tissoires
- removal of excessive logging from i2c-hid driver from Jason Andryuk
- fix specific to 2nd generation of Wacom Intuos devices from Jason
Gerecke
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: hiddev: fix potential Spectre v1
HID: i2c-hid: Fix "incomplete report" noise
HID: wacom: Correct touch maximum XY of 2nd-gen Intuos
HID: debug: check length before copy_to_user()
HID: core: allow concurrent registration of drivers
Diffstat (limited to 'drivers/hid/i2c-hid/i2c-hid.c')
| -rw-r--r-- | drivers/hid/i2c-hid/i2c-hid.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c index c1652bb7bd15..eae0cb3ddec6 100644 --- a/drivers/hid/i2c-hid/i2c-hid.c +++ b/drivers/hid/i2c-hid/i2c-hid.c @@ -484,7 +484,7 @@ static void i2c_hid_get_input(struct i2c_hid *ihid) return; } - if ((ret_size > size) || (ret_size <= 2)) { + if ((ret_size > size) || (ret_size < 2)) { dev_err(&ihid->client->dev, "%s: incomplete report (%d/%d)\n", __func__, size, ret_size); return; |