diff options
| -rw-r--r-- | kernel/time/timekeeping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 29a7d6709da1..2dc0646258ae 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c | |||
| @@ -1330,7 +1330,7 @@ static __always_inline void timekeeping_apply_adjustment(struct timekeeper *tk, | |||
| 1330 | * | 1330 | * |
| 1331 | * XXX - TODO: Doc ntp_error calculation. | 1331 | * XXX - TODO: Doc ntp_error calculation. |
| 1332 | */ | 1332 | */ |
| 1333 | if (tk->tkr.mult + mult_adj < mult_adj) { | 1333 | if ((mult_adj > 0) && (tk->tkr.mult + mult_adj < mult_adj)) { |
| 1334 | /* NTP adjustment caused clocksource mult overflow */ | 1334 | /* NTP adjustment caused clocksource mult overflow */ |
| 1335 | WARN_ON_ONCE(1); | 1335 | WARN_ON_ONCE(1); |
| 1336 | return; | 1336 | return; |
