]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
media: cec-pin: Fixed ktime_t to ns conversion
authorJasmin Jessich <jasmin@anw.at>
Sun, 25 Mar 2018 00:29:46 +0000 (20:29 -0400)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Wed, 4 Apr 2018 10:12:52 +0000 (06:12 -0400)
Older Kernels use a struct for ktime_t, which requires the conversion
function ktime_to_ns to be used on some places. With this patch it will
compile now also for older Kernel versions.

Signed-off-by: Jasmin Jessich <jasmin@anw.at>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/cec/cec-pin.c

index fafe1ebc8affbab051150f52833b86bad93a944c..2a5df99735fa27cc2a260da565357ce5cb45d80f 100644 (file)
@@ -668,7 +668,7 @@ static void cec_pin_rx_states(struct cec_pin *pin, ktime_t ts)
                /* Start bit low is too short, go back to idle */
                if (delta < CEC_TIM_START_BIT_LOW_MIN - CEC_TIM_IDLE_SAMPLE) {
                        if (!pin->rx_start_bit_low_too_short_cnt++) {
-                               pin->rx_start_bit_low_too_short_ts = pin->ts;
+                               pin->rx_start_bit_low_too_short_ts = ktime_to_ns(pin->ts);
                                pin->rx_start_bit_low_too_short_delta = delta;
                        }
                        cec_pin_to_idle(pin);
@@ -700,7 +700,7 @@ static void cec_pin_rx_states(struct cec_pin *pin, ktime_t ts)
                /* Start bit is too short, go back to idle */
                if (delta < CEC_TIM_START_BIT_TOTAL_MIN - CEC_TIM_IDLE_SAMPLE) {
                        if (!pin->rx_start_bit_too_short_cnt++) {
-                               pin->rx_start_bit_too_short_ts = pin->ts;
+                               pin->rx_start_bit_too_short_ts = ktime_to_ns(pin->ts);
                                pin->rx_start_bit_too_short_delta = delta;
                        }
                        cec_pin_to_idle(pin);
@@ -770,7 +770,7 @@ static void cec_pin_rx_states(struct cec_pin *pin, ktime_t ts)
                 */
                if (delta < CEC_TIM_DATA_BIT_TOTAL_MIN) {
                        if (!pin->rx_data_bit_too_short_cnt++) {
-                               pin->rx_data_bit_too_short_ts = pin->ts;
+                               pin->rx_data_bit_too_short_ts = ktime_to_ns(pin->ts);
                                pin->rx_data_bit_too_short_delta = delta;
                        }
                        cec_pin_low(pin);