Commit a9e89e54 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 9798f517 b6dc80db
...@@ -451,11 +451,11 @@ static void cs_hsi_read_on_control_complete(struct hsi_msg *msg) ...@@ -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); dev_dbg(&hi->cl->device, "Read on control: %08X\n", cmd);
cs_release_cmd(msg); cs_release_cmd(msg);
if (hi->flags & CS_FEAT_TSTAMP_RX_CTRL) { if (hi->flags & CS_FEAT_TSTAMP_RX_CTRL) {
struct timespec tspec; struct timespec64 tspec;
struct cs_timestamp *tstamp = struct cs_timestamp *tstamp =
&hi->mmap_cfg->tstamp_rx_ctrl; &hi->mmap_cfg->tstamp_rx_ctrl;
ktime_get_ts(&tspec); ktime_get_ts64(&tspec);
tstamp->tv_sec = (__u32) tspec.tv_sec; tstamp->tv_sec = (__u32) tspec.tv_sec;
tstamp->tv_nsec = (__u32) tspec.tv_nsec; tstamp->tv_nsec = (__u32) tspec.tv_nsec;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment