cec: don't Feature Abort broadcast msgs when unregistered

PATCH New Hans Verkuil 1 participant 1 message Aug 24, 2016

Subsystems (2)

Media (V4L/DVB) Staging

lore

Share & tools

lore

Hans Verkuil

author

2016-08-24 08:42 UTC #0 lore raw

PATCH 1/1 cec: don't Feature Abort broadcast msgs when unregistered

If the adapter is configured as 'Unregistered', then cec_receive_notify incorrectly thinks that broadcast messages are directed messages. The destination for broadcast messages is 0xf, and the logical address assigned to Unregistered devices is also 0xf and the logic didn't handle that correctly.

Signed-off-by Hans Verkuil <[email protected]>

---

drivers/staging/media/cec/cec-adap.c +1 -2

index b2393bb..51bb581 100644
@@ -1398,7 +1398,6 @@ static int cec_receive_notify(struct cec_adapter *adap, struct cec_msg *msg,
 	u8 init_laddr = cec_msg_initiator(msg);
 	u8 devtype = cec_log_addr2dev(adap, dest_laddr);
 	int la_idx = cec_log_addr2idx(adap, dest_laddr);
-	bool is_directed = la_idx >= 0;
 	bool from_unregistered = init_laddr == 0xf;
 	struct cec_msg tx_cec_msg = { };

@@ -1560,7 +1559,7 @@ static int cec_receive_notify(struct cec_adapter *adap, struct cec_msg *msg,
 		 * Unprocessed messages are aborted if userspace isn't doing
 		 * any processing either.
 		 */
-		if (is_directed && !is_reply && !adap->follower_cnt &&
+		if (!is_broadcast && !is_reply && !adap->follower_cnt &&
 		    !adap->cec_follower && msg->msg[1] != CEC_MSG_FEATURE_ABORT)
 			return cec_feature_abort(adap, msg);
 		break;