summaryrefslogtreecommitdiffstats
path: root/sound/usb
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2018-06-18 17:41:01 +0200
committerTakashi Iwai <tiwai@suse.de>2018-06-18 17:56:29 +0200
commita8eaad7b04eaab3df6b8db722d4418286815b46c (patch)
tree24a6da74fedfeeb85a2567d008128b8bfbe4fb21 /sound/usb
parenta753af301c616cd51dedb3b5a8b3ba6cac3e58b8 (diff)
downloadlinux-stable-a8eaad7b04eaab3df6b8db722d4418286815b46c.tar.gz
linux-stable-a8eaad7b04eaab3df6b8db722d4418286815b46c.tar.bz2
linux-stable-a8eaad7b04eaab3df6b8db722d4418286815b46c.zip
ALSA: line6: stop using get_seconds()
The get_seconds() function is deprecated because it truncates the timestamp to 32 bits, so all users should change to ktime_get_seconds() or ktime_get_real_seconds(). The firmware interface for passing the timestamp is also limited to 32 bits, so this patch only has the cosmetic effect of avoiding the old interface. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/line6/toneport.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/usb/line6/toneport.c b/sound/usb/line6/toneport.c
index 750467fb95db..f47ba94e6f4a 100644
--- a/sound/usb/line6/toneport.c
+++ b/sound/usb/line6/toneport.c
@@ -367,12 +367,13 @@ static bool toneport_has_source_select(struct usb_line6_toneport *toneport)
*/
static void toneport_setup(struct usb_line6_toneport *toneport)
{
- int ticks;
+ u32 ticks;
struct usb_line6 *line6 = &toneport->line6;
struct usb_device *usbdev = line6->usbdev;
/* sync time on device with host: */
- ticks = (int)get_seconds();
+ /* note: 32-bit timestamps overflow in year 2106 */
+ ticks = (u32)ktime_get_real_seconds();
line6_write_data(line6, 0x80c6, &ticks, 4);
/* enable device: */