summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-01-31 12:54:05 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2018-01-31 12:54:05 -0800
commita9e89e54483629ae68a44ced46cf590358beac2a (patch)
treebccb17e81cdef9fadabe76a3837caf8ebb6ffe6e
parent9798f5178f5791f964562eccedcf4dabe02fd825 (diff)
parentb6dc80dbe6cdf4effd5a07bcd37f34cbf25eb07a (diff)
downloadlinux-a9e89e54483629ae68a44ced46cf590358beac2a.tar.gz
linux-a9e89e54483629ae68a44ced46cf590358beac2a.tar.bz2
linux-a9e89e54483629ae68a44ced46cf590358beac2a.zip
Merge tag 'hsi-for-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi
Pull HSI update from Sebastian Reichel: "Y2038 fix for cmt-speech" * tag 'hsi-for-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi: HSI: cmt_speech: use timespec64 instead of timespec
-rw-r--r--drivers/hsi/clients/cmt_speech.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hsi/clients/cmt_speech.c b/drivers/hsi/clients/cmt_speech.c
index e6ad3de6c975..8fbbacb0fe21 100644
--- a/drivers/hsi/clients/cmt_speech.c
+++ b/drivers/hsi/clients/cmt_speech.c
@@ -451,11 +451,11 @@ static void cs_hsi_read_on_control_complete(struct hsi_msg *msg)
dev_dbg(&hi->cl->device, "Read on control: %08X\n", cmd);
cs_release_cmd(msg);
if (hi->flags & CS_FEAT_TSTAMP_RX_CTRL) {
- struct timespec tspec;
+ struct timespec64 tspec;
struct cs_timestamp *tstamp =
&hi->mmap_cfg->tstamp_rx_ctrl;
- ktime_get_ts(&tspec);
+ ktime_get_ts64(&tspec);
tstamp->tv_sec = (__u32) tspec.tv_sec;
tstamp->tv_nsec = (__u32) tspec.tv_nsec;