From c1ab7e5ac9d0f403b415599fcd8f1842b409cc6c Mon Sep 17 00:00:00 2001 From: Paul Walmsley Date: Wed, 25 Jan 2012 19:50:56 -0700 Subject: [PATCH] --- yaml --- r: 287443 b: refs/heads/master c: 197234520bd83aba2199add57a9d2678ee7f9781 h: refs/heads/master i: 287441: 68d40afe3f14717837bf5c520789e009b2f20dab 287439: c8557e3309e19e8415d388148acf618c4fca4e86 v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/omap-serial.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 671b311dd0f1..ac7a4e07780f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be4b0281956c5cae4f63f31f11d07625a6988766 +refs/heads/master: 197234520bd83aba2199add57a9d2678ee7f9781 diff --git a/trunk/drivers/tty/serial/omap-serial.c b/trunk/drivers/tty/serial/omap-serial.c index 18d13248d9ba..f80904145fd4 100644 --- a/trunk/drivers/tty/serial/omap-serial.c +++ b/trunk/drivers/tty/serial/omap-serial.c @@ -740,8 +740,7 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios, quot = serial_omap_get_divisor(port, baud); /* calculate wakeup latency constraint */ - up->calc_latency = (1000000 * up->port.fifosize) / - (1000 * baud / 8); + up->calc_latency = (USEC_PER_SEC * up->port.fifosize) / (baud / 8); up->latency = up->calc_latency; schedule_work(&up->qos_work);