This is an automatic generated email to let you know that the following patch 
were queued at the 
http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:

Subject: cec-follower: use ev.state_change.log_addr_mask
Author:  Hans Verkuil <hans.verk...@cisco.com>
Date:    Tue Aug 8 13:52:31 2017 +0200

Use ev.state_change.log_addr_mask instead of calling G_LOG_ADDRS.

Signed-off-by: Hans Verkuil <hans.verk...@cisco.com>

 utils/cec-follower/cec-processing.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

---

http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=82df1903d21bdf08a1ad5e0ab6cc6fa0c9190007
diff --git a/utils/cec-follower/cec-processing.cpp 
b/utils/cec-follower/cec-processing.cpp
index 88ab82863245..f1803cd29be8 100644
--- a/utils/cec-follower/cec-processing.cpp
+++ b/utils/cec-follower/cec-processing.cpp
@@ -1059,10 +1059,14 @@ void testProcessing(struct node *node)
                        if (ev.event == CEC_EVENT_STATE_CHANGE) {
                                dev_info("CEC adapter state change.\n");
                                node->phys_addr = ev.state_change.phys_addr;
-                               doioctl(node, CEC_ADAP_G_LOG_ADDRS, &laddrs);
-                               node->adap_la_mask = laddrs.log_addr_mask;
-                               node->state.active_source_pa = 
CEC_PHYS_ADDR_INVALID;
-                               me = laddrs.log_addr[0];
+                               node->adap_la_mask = 
ev.state_change.log_addr_mask;
+                               if (node->adap_la_mask) {
+                                       doioctl(node, CEC_ADAP_G_LOG_ADDRS, 
&laddrs);
+                                       me = laddrs.log_addr[0];
+                               } else {
+                                       node->state.active_source_pa = 
CEC_PHYS_ADDR_INVALID;
+                                       me = CEC_LOG_ADDR_INVALID;
+                               }
                                memset(la_info, 0, sizeof(la_info));
                        }
                }

_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to