Merge tag 'hsi-for-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 31 Jan 2018 20:54:05 +0000 (12:54 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 31 Jan 2018 20:54:05 +0000 (12:54 -0800)
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

drivers/hsi/clients/cmt_speech.c

index e6ad3de6c975309914e7e3dd8351ca667cd885ae..8fbbacb0fe21ec5937ad8a123b1aefb6f5ee44a6 100644 (file)
@@ -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;