From b492e4b51604ace192d896b1ff3f820cbdbfcab5 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Fri, 11 Jan 2013 11:58:58 +0100
Subject: [PATCH] --- yaml --- r: 350162 b: refs/heads/master c:
 f0dbe81f0e7c39783ad25d9084bbcda131508993 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/kernel/posix-timers.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4a68cd2ba564..92abb9d4c8bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2353b47bffe4e6ab39042f470c55d41bb3ff3846
+refs/heads/master: f0dbe81f0e7c39783ad25d9084bbcda131508993
diff --git a/trunk/kernel/posix-timers.c b/trunk/kernel/posix-timers.c
index 69185ae6b701..10349d5f2ec3 100644
--- a/trunk/kernel/posix-timers.c
+++ b/trunk/kernel/posix-timers.c
@@ -997,7 +997,7 @@ SYSCALL_DEFINE2(clock_adjtime, const clockid_t, which_clock,
 
 	err = kc->clock_adj(which_clock, &ktx);
 
-	if (!err && copy_to_user(utx, &ktx, sizeof(ktx)))
+	if (err >= 0 && copy_to_user(utx, &ktx, sizeof(ktx)))
 		return -EFAULT;
 
 	return err;