Merge remote-tracking branch 'staging/staging-next'

[karo-tx-linux.git] / drivers / staging / comedi / drivers / serial2002.c

diff --git a/drivers/staging/comedi/drivers/serial2002.c b/drivers/staging/comedi/drivers/serial2002.c
index a7f170e60633bcd8c70acd685870e37a1045f938..304ebff119eeac1cd83a70cd318b5957b2135f11 100644 (file)
--- a/drivers/staging/comedi/drivers/serial2002.c
+++ b/drivers/staging/comedi/drivers/serial2002.c
@@ -39,14 +39,12 @@ Status: in development
 #include <linux/poll.h>
 
 struct serial2002_range_table_t {
-
        /*  HACK... */
        int length;
        struct comedi_krange range;
 };
 
 struct serial2002_private {
-
        int port;               /*  /dev/ttyS<port> */
        int speed;              /*  baudrate */
        struct file *tty;
@@ -137,8 +135,8 @@ static void serial2002_tty_read_poll_wait(struct file *f, int timeout)
                        break;
                }
                do_gettimeofday(&now);
-               elapsed = (1000000 * (now.tv_sec - start.tv_sec) +
-                         now.tv_usec - start.tv_usec);
+               elapsed = 1000000 * (now.tv_sec - start.tv_sec) +
+                         now.tv_usec - start.tv_usec;
                if (elapsed > timeout)
                        break;
                set_current_state(TASK_INTERRUPTIBLE);
@@ -294,7 +292,6 @@ static struct serial_data serial2002_read(struct file *f, int timeout)
                }
        }
        return result;
-
 }
 
 static void serial2002_write(struct file *f, struct serial_data data)