If command & data registers are to be used and report ID >= 0xF
use the sentinel value for report ID in the command.
Do not alter the report ID itself as it needs to be inserted into the args
buffer. If output register is to be used there is no need to insert
report IDs >= 0xF.
Signed-off-by: Angela Czubak <acz@xxxxxxxxxxxx>
---
drivers/hid/i2c-hid/i2c-hid-core.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/hid/i2c-hid/i2c-hid-core.c b/drivers/hid/i2c-hid/i2c-hid-core.c
index 517141138b00..8cb925c86bbf 100644
--- a/drivers/hid/i2c-hid/i2c-hid-core.c
+++ b/drivers/hid/i2c-hid/i2c-hid-core.c
@@ -341,6 +341,7 @@ static int i2c_hid_set_or_send_report(struct i2c_client *client, u8 reportType,
u16 size;
int args_len;
int index = 0;
+ u8 cmdReportID = reportID;
i2c_hid_dbg(ihid, "%s\n", __func__);
@@ -357,16 +358,15 @@ static int i2c_hid_set_or_send_report(struct i2c_client *client, u8 reportType,
if (!use_data && maxOutputLength == 0)
return -ENOSYS;
- if (reportID >= 0x0F) {
- args[index++] = reportID;
- reportID = 0x0F;
- }
-
/*
* use the data register for feature reports or if the device does not
* support the output register
*/
if (use_data) {
+ if (reportID >= 0x0F) {
+ args[index++] = reportID;
+ cmdReportID = 0x0F;
+ }
args[index++] = dataRegister & 0xFF;
args[index++] = dataRegister >> 8;
hidcmd = &hid_set_report_cmd;
@@ -384,7 +384,7 @@ static int i2c_hid_set_or_send_report(struct i2c_client *client, u8 reportType,
memcpy(&args[index], buf, data_len);
- ret = __i2c_hid_command(client, hidcmd, reportID,
+ ret = __i2c_hid_command(client, hidcmd, cmdReportID,
reportType, args, args_len, NULL, 0);
if (ret) {
dev_err(&client->dev, "failed to set a report to device.\n");
--
2.34.1.307.g9b7440fafd-goog
