diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-11-03 23:42:16 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-11-03 23:42:16 +0100 |
| commit | 23a12ddee1ce28065b71f14ccc695b5a0c8a64ff (patch) | |
| tree | cedaa1cde5b2557116e523c31552187804704093 /drivers/media/cec/cec-pin.c | |
| parent | compat: Cleanup in_compat_syscall() callers (diff) | |
| parent | objtool: Support GCC 9 cold subfunction naming scheme (diff) | |
| download | linux-23a12ddee1ce28065b71f14ccc695b5a0c8a64ff.tar.xz linux-23a12ddee1ce28065b71f14ccc695b5a0c8a64ff.zip | |
Merge branch 'core/urgent' into x86/urgent, to pick up objtool fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/media/cec/cec-pin.c')
| -rw-r--r-- | drivers/media/cec/cec-pin.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/drivers/media/cec/cec-pin.c b/drivers/media/cec/cec-pin.c index 6e311424f0dc..635db8e70ead 100644 --- a/drivers/media/cec/cec-pin.c +++ b/drivers/media/cec/cec-pin.c @@ -935,6 +935,17 @@ static enum hrtimer_restart cec_pin_timer(struct hrtimer *timer) /* Start bit, switch to receive state */ pin->ts = ts; pin->state = CEC_ST_RX_START_BIT_LOW; + /* + * If a transmit is pending, then that transmit should + * use a signal free time of no more than + * CEC_SIGNAL_FREE_TIME_NEW_INITIATOR since it will + * have a new initiator due to the receive that is now + * starting. + */ + if (pin->tx_msg.len && pin->tx_signal_free_time > + CEC_SIGNAL_FREE_TIME_NEW_INITIATOR) + pin->tx_signal_free_time = + CEC_SIGNAL_FREE_TIME_NEW_INITIATOR; break; } if (ktime_to_ns(pin->ts) == 0) @@ -1157,6 +1168,15 @@ static int cec_pin_adap_transmit(struct cec_adapter *adap, u8 attempts, { struct cec_pin *pin = adap->pin; + /* + * If a receive is in progress, then this transmit should use + * a signal free time of max CEC_SIGNAL_FREE_TIME_NEW_INITIATOR + * since when it starts transmitting it will have a new initiator. + */ + if (pin->state != CEC_ST_IDLE && + signal_free_time > CEC_SIGNAL_FREE_TIME_NEW_INITIATOR) + signal_free_time = CEC_SIGNAL_FREE_TIME_NEW_INITIATOR; + pin->tx_signal_free_time = signal_free_time; pin->tx_extra_bytes = 0; pin->tx_msg = *msg; |