Commit 552f12eb authored by Benjamin Tissoires's avatar Benjamin Tissoires Committed by Jiri Kosina

HID: logitech-hidpp: 2 fixes in hidpp_root_get_protocol_version()

- remove the constant '1'
- when the device is not connected, the protocol error
  HIDPP_ERROR_RESOURCE_ERROR is raised. We should not warn the user about
  it because it is somewhat expected as an answer when we check if the
  device is connected.
Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 8c9952b2
...@@ -361,12 +361,16 @@ static int hidpp_root_get_protocol_version(struct hidpp_device *hidpp) ...@@ -361,12 +361,16 @@ static int hidpp_root_get_protocol_version(struct hidpp_device *hidpp)
CMD_ROOT_GET_PROTOCOL_VERSION, CMD_ROOT_GET_PROTOCOL_VERSION,
NULL, 0, &response); NULL, 0, &response);
if (ret == 1) { if (ret == HIDPP_ERROR_INVALID_SUBID) {
hidpp->protocol_major = 1; hidpp->protocol_major = 1;
hidpp->protocol_minor = 0; hidpp->protocol_minor = 0;
return 0; return 0;
} }
/* the device might not be connected */
if (ret == HIDPP_ERROR_RESOURCE_ERROR)
return -EIO;
if (ret > 0) { if (ret > 0) {
hid_err(hidpp->hid_dev, "%s: received protocol error 0x%02x\n", hid_err(hidpp->hid_dev, "%s: received protocol error 0x%02x\n",
__func__, ret); __func__, ret);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment