diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2016-08-01 06:29:34 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-08-22 12:14:56 -0400 |
commit | 9ebf1945d757433a089ab3ee940673503e3e11ec (patch) | |
tree | fbb1b5014aad8993942b5c87359f2195e701927c /include/linux/cec-funcs.h | |
parent | 2ab25d35a91098ef0f42d478cc37f6a5591a4ab0 (diff) |
[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, | |||
227 | if (digital->service_id_method == CEC_OP_SERVICE_ID_METHOD_BY_CHANNEL) { | 227 | if (digital->service_id_method == CEC_OP_SERVICE_ID_METHOD_BY_CHANNEL) { |
228 | *msg++ = (digital->channel.channel_number_fmt << 2) | | 228 | *msg++ = (digital->channel.channel_number_fmt << 2) | |
229 | (digital->channel.major >> 8); | 229 | (digital->channel.major >> 8); |
230 | *msg++ = digital->channel.major && 0xff; | 230 | *msg++ = digital->channel.major & 0xff; |
231 | *msg++ = digital->channel.minor >> 8; | 231 | *msg++ = digital->channel.minor >> 8; |
232 | *msg++ = digital->channel.minor & 0xff; | 232 | *msg++ = digital->channel.minor & 0xff; |
233 | *msg++ = 0; | 233 | *msg++ = 0; |
@@ -1277,7 +1277,7 @@ static inline void cec_msg_user_control_pressed(struct cec_msg *msg, | |||
1277 | msg->len += 4; | 1277 | msg->len += 4; |
1278 | msg->msg[3] = (ui_cmd->channel_identifier.channel_number_fmt << 2) | | 1278 | msg->msg[3] = (ui_cmd->channel_identifier.channel_number_fmt << 2) | |
1279 | (ui_cmd->channel_identifier.major >> 8); | 1279 | (ui_cmd->channel_identifier.major >> 8); |
1280 | msg->msg[4] = ui_cmd->channel_identifier.major && 0xff; | 1280 | msg->msg[4] = ui_cmd->channel_identifier.major & 0xff; |
1281 | msg->msg[5] = ui_cmd->channel_identifier.minor >> 8; | 1281 | msg->msg[5] = ui_cmd->channel_identifier.minor >> 8; |
1282 | msg->msg[6] = ui_cmd->channel_identifier.minor & 0xff; | 1282 | msg->msg[6] = ui_cmd->channel_identifier.minor & 0xff; |
1283 | break; | 1283 | break; |