On Sat, Mar 21, 2015 at 09:59:52PM +0100, Richard Cochran wrote:
> diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c
> index 296b0ec..2665360 100644
> --- 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;
> }
Oops, both of these functions should have started using the new
methods *before* migrating the drivers. Will fix in V2.
Thanks,
Richard
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
