diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-02-23 11:21:57 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-02-23 11:21:57 +0100 |
| commit | 059e307f52966dabb8d816393eabeadcc64777f0 (patch) | |
| tree | fc01450ce5b959c0dbe8948f4351e9d50ac864be /kernel | |
| parent | c483800b8ad4575b80f3ce687d6e4477886e5656 (diff) | |
| parent | db1c1cce4a653dcbe6949c72ae7b9f42cab1b929 (diff) | |
Merge branch 'timers/core' into auto-latest
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/time/ntp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index 5ac593267a26..5f1bb8e2008f 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c @@ -650,13 +650,13 @@ int do_adjtimex(struct timex *txc) if (txc->modes & ADJ_SETOFFSET) { struct timespec delta; - if ((unsigned long)txc->time.tv_usec >= NSEC_PER_SEC) - return -EINVAL; delta.tv_sec = txc->time.tv_sec; delta.tv_nsec = txc->time.tv_usec; if (!(txc->modes & ADJ_NANO)) delta.tv_nsec *= 1000; - timekeeping_inject_offset(&delta); + result = timekeeping_inject_offset(&delta); + if (result) + return result; } getnstimeofday(&ts); |