---

yaml --- r: 234620 b: refs/heads/master c: db1c1cc h: refs/heads/master v: v3
git-mirror · Feb 18, 2011 · 56d5e31 · 56d5e31
1 parent 9bdde77
commit 56d5e31
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22b7fcdae562b6792b3f5517e89fd7e0337180ae
+refs/heads/master: db1c1cce4a653dcbe6949c72ae7b9f42cab1b929
diff --git a/trunk/kernel/time/ntp.c b/trunk/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);