diff options
| author | Hans Verkuil | 2016-08-01 12:29:34 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2016-08-22 18:14:56 +0200 |
| commit | 9ebf1945d757433a089ab3ee940673503e3e11ec (patch) | |
| tree | fbb1b5014aad8993942b5c87359f2195e701927c /include/linux/cec-funcs.h | |
| parent | [media] cec: improve locking (diff) | |
| download | kernel-qcow2-linux-9ebf1945d757433a089ab3ee940673503e3e11ec.tar.gz kernel-qcow2-linux-9ebf1945d757433a089ab3ee940673503e3e11ec.tar.xz kernel-qcow2-linux-9ebf1945d757433a089ab3ee940673503e3e11ec.zip | |
[media] cec-funcs.h: fix typo: && should be &
Fix typo where logical AND was used instead of bitwise AND.
Reported-by: David Binderman <linuxdev.baldrick@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'include/linux/cec-funcs.h')
| -rw-r--r-- | include/linux/cec-funcs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/cec-funcs.h b/include/linux/cec-funcs.h index 82c3d3b7269d..9e054aa168f3 100644 --- a/include/linux/cec-funcs.h +++ b/include/linux/cec-funcs.h @@ -227,7 +227,7 @@ static inline void cec_set_digital_service_id(__u8 *msg, if (digital->service_id_method == CEC_OP_SERVICE_ID_METHOD_BY_CHANNEL) { *msg++ = (digital->channel.channel_number_fmt << 2) | (digital->channel.major >> 8); - *msg++ = digital->channel.major && 0xff; + *msg++ = digital->channel.major & 0xff; *msg++ = digital->channel.minor >> 8; *msg++ = digital->channel.minor & 0xff; *msg++ = 0; @@ -1277,7 +1277,7 @@ static inline void cec_msg_user_control_pressed(struct cec_msg *msg, msg->len += 4; msg->msg[3] = (ui_cmd->channel_identifier.channel_number_fmt << 2) | (ui_cmd->channel_identifier.major >> 8); - msg->msg[4] = ui_cmd->channel_identifier.major && 0xff; + msg->msg[4] = ui_cmd->channel_identifier.major & 0xff; msg->msg[5] = ui_cmd->channel_identifier.minor >> 8; msg->msg[6] = ui_cmd->channel_identifier.minor & 0xff; break; |