Merge remote-tracking branch 'y2038/y2038'

[karo-tx-linux.git] / drivers / staging / ft1000 / ft1000-usb / ft1000_debug.c

diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c b/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
index 2d758fb26eac3c818f5e6adb91f08ec9171a7487..2070a657566e17552d8b738de90acca8360a53d0 100644 (file)
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
@@ -412,7 +412,6 @@ static long ft1000_ioctl(struct file *file, unsigned int command,
        int i;
        u16 tempword;
        unsigned long flags;
-       struct timeval tv;
        struct IOCTL_GET_VER get_ver_data;
        struct IOCTL_GET_DSP_STAT get_stat_data;
        u8 ConnectionMsg[] = {0x00, 0x44, 0x10, 0x20, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x93, 0x64,
@@ -510,8 +509,7 @@ static long ft1000_ioctl(struct file *file, unsigned int command,
                get_stat_data.nRxPkts = info->stats.rx_packets;
                get_stat_data.nTxBytes = info->stats.tx_bytes;
                get_stat_data.nRxBytes = info->stats.rx_bytes;
-               do_gettimeofday(&tv);
-               get_stat_data.ConTm = (u32)(tv.tv_sec - info->ConTm);
+               get_stat_data.ConTm = ktime_get_seconds() - info->ConTm;
                pr_debug("Connection Time = %d\n", (int)get_stat_data.ConTm);
                if (copy_to_user(argp, &get_stat_data, sizeof(get_stat_data))) {
                        pr_debug("copy fault occurred\n");