summaryrefslogtreecommitdiff
path: root/include/media
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2018-10-05 08:00:21 -0400
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-10-05 11:27:15 -0400
commit7d867a1b765e2b70815fec4964d7822a976ed349 (patch)
tree64e009447bfda287b799b030e830616421b89b18 /include/media
parentab83203e181015b099720aff43ffabc1812e0fb3 (diff)
downloadlinux-rpi-7d867a1b765e2b70815fec4964d7822a976ed349.tar.gz
linux-rpi-7d867a1b765e2b70815fec4964d7822a976ed349.tar.bz2
linux-rpi-7d867a1b765e2b70815fec4964d7822a976ed349.zip
media: cec: fix the Signal Free Time calculation
The calculation of the Signal Free Time in the framework was not correct. If a message was received, then the next transmit should be considered a New Initiator and use a shorter SFT value. This was not done with the result that if both sides where continually sending messages, they both could use the same SFT value and one side could deny the other side access to the bus. Note that this fix does not take the corner case into account where a receive is in progress when you call adap_transmit. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Cc: <stable@vger.kernel.org> # for v4.18 and up Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/cec.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/cec.h b/include/media/cec.h
index 9f382f0c2970..254a610b9aa5 100644
--- a/include/media/cec.h
+++ b/include/media/cec.h
@@ -63,7 +63,6 @@ struct cec_data {
struct delayed_work work;
struct completion c;
u8 attempts;
- bool new_initiator;
bool blocking;
bool completed;
};
@@ -174,6 +173,7 @@ struct cec_adapter {
bool is_configuring;
bool is_configured;
bool cec_pin_is_high;
+ u8 last_initiator;
u32 monitor_all_cnt;
u32 monitor_pin_cnt;
u32 follower_cnt;