Merge branch 'iocb' into for-davem

[deliverable/linux.git] / drivers / ptp / ptp_clock.c

diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c
index 296b0ec8744da915763f8444c2ae8e902376c33e..2e481b9e8ea597858e08ab8933374fce8ccd197c 100644 (file)
--- a/drivers/ptp/ptp_clock.c
+++ b/drivers/ptp/ptp_clock.c
@@ -107,13 +107,21 @@ static int ptp_clock_getres(struct posix_clock *pc, struct timespec *tp)
 static int ptp_clock_settime(struct posix_clock *pc, const struct timespec *tp)
 {
        struct ptp_clock *ptp = container_of(pc, struct ptp_clock, clock);
-       return ptp->info->settime(ptp->info, tp);
+       struct timespec64 ts = timespec_to_timespec64(*tp);
+
+       return  ptp->info->settime64(ptp->info, &ts);
 }
 
 static int ptp_clock_gettime(struct posix_clock *pc, struct timespec *tp)
 {
        struct ptp_clock *ptp = container_of(pc, struct ptp_clock, clock);
-       return ptp->info->gettime(ptp->info, tp);
+       struct timespec64 ts;
+       int err;
+
+       err = ptp->info->gettime64(ptp->info, &ts);
+       if (!err)
+               *tp = timespec64_to_timespec(ts);
+       return err;
 }
 
 static int ptp_clock_adjtime(struct posix_clock *pc, struct timex *tx)