From 56d5e312e3d7e4198483b669aa9fddfc0da04bc0 Mon Sep 17 00:00:00 2001
From: Richard Cochran <richardcochran@gmail.com>
Date: Fri, 18 Feb 2011 10:07:25 +0100
Subject: [PATCH] --- yaml --- r: 234620 b: refs/heads/master c:
 db1c1cce4a653dcbe6949c72ae7b9f42cab1b929 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/kernel/time/ntp.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index c16e8c1b096d..41c0fe1f07e7 100644
--- 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
index 5ac593267a26..5f1bb8e2008f 100644
--- 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);