summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-08 13:21:28 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-08 13:21:28 -0800
commit09d9673d53005fdf40de4c759425893904292236 (patch)
tree0c7b526b3338a5e8541b4da157e2cafaa3a1c1c5 /drivers
parentfb38f9b8fe98a9c1f6b1e57d1b08b1102b293929 (diff)
parentc9c024b3f3e07d087974db4c0dc46217fff3a6c0 (diff)
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: alarmtimers: Fix time comparison ptp: Fix clock_getres() implementation
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ptp/ptp_clock.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c
index cf3f9997546d..10451a15e828 100644
--- a/drivers/ptp/ptp_clock.c
+++ b/drivers/ptp/ptp_clock.c
@@ -101,7 +101,9 @@ static s32 scaled_ppm_to_ppb(long ppm)
static int ptp_clock_getres(struct posix_clock *pc, struct timespec *tp)
{
- return 1; /* always round timer functions to one nanosecond */
+ tp->tv_sec = 0;
+ tp->tv_nsec = 1;
+ return 0;
}
static int ptp_clock_settime(struct posix_clock *pc, const struct timespec *tp)