From 9d4ec540954165c726cc83222f4a0fa1d5c34563 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Wed, 6 Nov 2013 10:33:31 +0200 Subject: [PATCH] android/hid: Fix unnecessary second check for cmd->buf_size value --- android/hid.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/android/hid.c b/android/hid.c index 224c8f720..c38c4c14e 100644 --- a/android/hid.c +++ b/android/hid.c @@ -856,14 +856,12 @@ static uint8_t bt_hid_get_report(struct hal_cmd_hid_get_report *cmd, return HAL_STATUS_NOMEM; req[0] = HID_MSG_GET_REPORT | cmd->type; - - if (cmd->buf_size > 0) - req[0] = req[0] | HID_GET_REPORT_SIZE_FIELD; - req[1] = cmd->id; - if (cmd->buf_size > 0) - bt_put_le16(cmd->buf_size, (req + 2)); + if (cmd->buf_size > 0) { + req[0] = req[0] | HID_GET_REPORT_SIZE_FIELD; + bt_put_le16(cmd->buf_size, &req[2]); + } fd = g_io_channel_unix_get_fd(dev->ctrl_io); -- 2.47.3