diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2019-11-29 20:37:55 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2019-11-29 20:37:55 +0100 |
| commit | a820e450390a5a0a9a2174e79326318f4703668b (patch) | |
| tree | d5f61bfa4642f7cca6d4b22a46e5a258bf2c2337 /drivers/hid/hid-logitech-hidpp.c | |
| parent | Merge branch 'for-5.5/ish' into for-linus (diff) | |
| parent | HID: logitech-hidpp: Silence intermittent get_battery_capacity errors (diff) | |
| download | linux-a820e450390a5a0a9a2174e79326318f4703668b.tar.xz linux-a820e450390a5a0a9a2174e79326318f4703668b.zip | |
Merge branch 'for-5.5/logitech' into for-linus
- Support for Logitech G15 (Hans de Goede)
- silencing of non-informative error flow in dmesg from
logitechi-hiddpp (Hans de Goede)
Diffstat (limited to 'drivers/hid/hid-logitech-hidpp.c')
| -rw-r--r-- | drivers/hid/hid-logitech-hidpp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c index 8e91e2f06cb4..cd9193078525 100644 --- a/drivers/hid/hid-logitech-hidpp.c +++ b/drivers/hid/hid-logitech-hidpp.c @@ -1102,6 +1102,9 @@ static int hidpp20_batterylevel_get_battery_capacity(struct hidpp_device *hidpp, ret = hidpp_send_fap_command_sync(hidpp, feature_index, CMD_BATTERY_LEVEL_STATUS_GET_BATTERY_LEVEL_STATUS, NULL, 0, &response); + /* Ignore these intermittent errors */ + if (ret == HIDPP_ERROR_RESOURCE_ERROR) + return -EIO; if (ret > 0) { hid_err(hidpp->hid_dev, "%s: received protocol error 0x%02x\n", __func__, ret); |