hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HSI changes for the v4.16 series 

* Y2038 fix for cmt-speech
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEE72YNB0Y/i3JqeVQT2O7X88g7+poFAlpx1osACgkQ2O7X88g7
 +pqVmQ/+NRwe7oc9NbGr4tM1bVrVTTOKZ2N186ZT8/ZcMfhy8Sk/Am+w8mZuV5TI
 1E15WCQHO66URrjtstr0kOO/KVY9TWnM0cFOIEf3Y+k3EDHWkCJcMobM9FOsDTiF
 GTGrIfwm2yVx7R9/raYiUXJLKAMyiXgHBGkrQ9mCqyE+rdooASJyI2SirnkRoOXL
 5VEvu0eOkoAVwY1ZIctQpmXB7qUWBjIuJDALDE7MUBhhO+gJmISFB+Fo7j2EBkqs
 qerbvWF06kXmNS0nS88XsqjZ8WpiGc2xzF9Npp6UoAXTN16WqZe+n+m1aFCixUKH
 N07MvWFpk4X6CtJzfuNyp4v4XXPoaR8c1xSdoXqRK9xJV2r5RoLKTR2YUS3ur6li
 7etaewFZYXQtZRlnCUlS4Ge17Wb+hB2+6593GPZQbkIfqd+5zqlJzTxvS5hWE3qi
 5pCVggBvKFxSB0+1/Nt2Z0n3JtwJ+G+3bStjfOPcbjtUkX9iAQuuQo9ifIWLS3AJ
 3uEQLvGky/mtwKonRBl9fm03C4kXLYFf3rM28YIsYSDVJqmFZ69epzvIe4V/LOwW
 gujJ/7L9Xr5SCUISqN56/GjV5QW5rtkdY9HjN1TXhgTgpQQFrEnH30zXc6cb+fXh
 GgTxY1Ws5PVZwNsVqXHrEoYtmAFP3FJDGuroCZeG1WVWUs2tQWA=
 =6r40
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2018-01-31 12:54:05 -08:00
parent 9798f5178f b6dc80dbe6
commit a9e89e5448
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/hsi/clients/cmt_speech.c
View 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); 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;