Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9e89e54 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

drivers/hsi/clients/cmt_speech.c

+2 −2
Original line number Diff line number Diff line
@@ -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;