diff options
| author | Richard Cochran <richardcochran@gmail.com> | 2012-09-22 09:02:02 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-09-22 21:42:08 +0200 |
| commit | 5c35bad5ffe5accde6b0ef4468b39e1db0806b94 (patch) | |
| tree | fee97b7d9660d3bb4c070aefad1bdbd07feae0bd | |
| parent | ptp: remember the adjusted frequency (diff) | |
| download | linux-5c35bad5ffe5accde6b0ef4468b39e1db0806b94.tar.xz linux-5c35bad5ffe5accde6b0ef4468b39e1db0806b94.zip | |
ptp: provide the clock's adjusted frequency
If the timex.mode field indicates a query, then we provide the value of
the current frequency adjustment.
[ Get rid of extraneous empty lines -DaveM ]
Signed-off-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/ptp/ptp_clock.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c index 67e628ee0365..c470ddf1a6fa 100644 --- a/drivers/ptp/ptp_clock.c +++ b/drivers/ptp/ptp_clock.c @@ -143,11 +143,12 @@ static int ptp_clock_adjtime(struct posix_clock *pc, struct timex *tx) kt = timespec_to_ktime(ts); delta = ktime_to_ns(kt); err = ops->adjtime(ops, delta); - } else if (tx->modes & ADJ_FREQUENCY) { - err = ops->adjfreq(ops, scaled_ppm_to_ppb(tx->freq)); ptp->dialed_frequency = tx->freq; + } else if (tx->modes == 0) { + tx->freq = ptp->dialed_frequency; + err = 0; } return err; |