summaryrefslogtreecommitdiff
path: root/net/ax25/ax25_timer.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ax25/ax25_timer.c')
-rw-r--r--net/ax25/ax25_timer.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ax25/ax25_timer.c b/net/ax25/ax25_timer.c
index 85865ebfdfa2..9f7cb0a7c73f 100644
--- a/net/ax25/ax25_timer.c
+++ b/net/ax25/ax25_timer.c
@@ -108,10 +108,12 @@ int ax25_t1timer_running(ax25_cb *ax25)
unsigned long ax25_display_timer(struct timer_list *timer)
{
+ long delta = timer->expires - jiffies;
+
if (!timer_pending(timer))
return 0;
- return timer->expires - jiffies;
+ return max(0L, delta);
}
EXPORT_SYMBOL(ax25_display_timer);