diff options
| author | Antonio Borneo <borneo.antonio@gmail.com> | 2015-06-21 14:20:25 +0800 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-08-11 09:57:30 +0100 |
| commit | e56b594c00cbc69c664fd350632a25184ce59bb7 (patch) | |
| tree | afd4db7f7048638197b97f950003a6d63d4517fa /drivers/hid | |
| parent | 2558b5b7ab218804ee03f5f13c0d3036e409dabe (diff) | |
| download | linux-stable-e56b594c00cbc69c664fd350632a25184ce59bb7.tar.gz linux-stable-e56b594c00cbc69c664fd350632a25184ce59bb7.tar.bz2 linux-stable-e56b594c00cbc69c664fd350632a25184ce59bb7.zip | |
HID: cp2112: fix to force single data-report reply
commit 6debce6f4e787a8eb4cec94e7afa85fb4f40db27 upstream.
Current implementation of cp2112_raw_event() only accepts one data report at a
time. If last received data report is not fully handled yet, a new incoming
data report will overwrite it. In such case we don't guaranteed to propagate
the correct incoming data.
The trivial fix implemented here forces a single report at a time by requesting
in cp2112_read() no more than 61 byte of data, which is the payload size of a
single data report.
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Tested-by: Ellen Wang <ellen@cumulusnetworks.com>
Signed-off-by: Jiri Kosina <jkosina@suse.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-cp2112.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hid/hid-cp2112.c b/drivers/hid/hid-cp2112.c index 56be85a9a77c..ffe69be882de 100644 --- a/drivers/hid/hid-cp2112.c +++ b/drivers/hid/hid-cp2112.c @@ -352,6 +352,8 @@ static int cp2112_read(struct cp2112_device *dev, u8 *data, size_t size) struct cp2112_force_read_report report; int ret; + if (size > sizeof(dev->read_data)) + size = sizeof(dev->read_data); report.report = CP2112_DATA_READ_FORCE_SEND; report.length = cpu_to_be16(size); |