From 938652a4dde57859f492f7da054d8e775410ca92 Mon Sep 17 00:00:00 2001 From: Tomasz Lauda Date: Thu, 10 Oct 2019 14:20:19 +0200 Subject: [PATCH] timer: fix return values of platform_timer_set and arch_timer_set Fixes return value of platform_timer_set and arch_timer_set functions. Change was introduced for cAVS platforms, which accidentally broke these functions for other platforms. The intention of this functions is to return value of set ticks, so the timer scheduler can check for delays. Fixes: 75188e22434d ("timer: rework timer_set() so it verifies requested ticks") Signed-off-by: Tomasz Lauda --- src/arch/xtensa/drivers/timer.c | 2 +- src/drivers/intel/baytrail/timer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/arch/xtensa/drivers/timer.c b/src/arch/xtensa/drivers/timer.c index f242a6023c51..2c4ece4a34c3 100644 --- a/src/arch/xtensa/drivers/timer.c +++ b/src/arch/xtensa/drivers/timer.c @@ -133,5 +133,5 @@ int64_t arch_timer_set(struct timer *timer, uint64_t ticks) xthal_set_ccompare(timer->id, time); arch_interrupt_global_enable(flags); - return 0; + return ticks; } diff --git a/src/drivers/intel/baytrail/timer.c b/src/drivers/intel/baytrail/timer.c index f6738e0a45cd..66de04f96a3c 100644 --- a/src/drivers/intel/baytrail/timer.c +++ b/src/drivers/intel/baytrail/timer.c @@ -106,7 +106,7 @@ int64_t platform_timer_set(struct timer *timer, uint64_t ticks) arch_interrupt_global_enable(flags); - return 0; + return ticks; } void platform_timer_clear(struct timer *timer)