summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/test-drivers/vidtv/vidtv_mux.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/media/test-drivers/vidtv/vidtv_mux.c b/drivers/media/test-drivers/vidtv/vidtv_mux.c
index 43b13aa3a8bc..6a3123c51cc4 100644
--- a/drivers/media/test-drivers/vidtv/vidtv_mux.c
+++ b/drivers/media/test-drivers/vidtv/vidtv_mux.c
@@ -100,11 +100,7 @@ static void vidtv_mux_update_clk(struct vidtv_mux *m)
/* call this at every thread iteration */
u64 elapsed_time;
- /* this will not hold a value yet if we have just started */
- m->timing.past_jiffies = m->timing.current_jiffies ?
- m->timing.current_jiffies :
- get_jiffies_64();
-
+ m->timing.past_jiffies = m->timing.current_jiffies;
m->timing.current_jiffies = get_jiffies_64();
elapsed_time = jiffies_to_usecs(m->timing.current_jiffies -
@@ -449,6 +445,7 @@ struct vidtv_mux *vidtv_mux_init(struct dvb_frontend *fe,
m->pcr_pid = args.pcr_pid;
m->transport_stream_id = args.transport_stream_id;
m->priv = args.priv;
+ m->timing.current_jiffies = get_jiffies_64();
if (args.channels)
m->channels = args.channels;