diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2015-01-19 20:28:17 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2015-01-19 20:28:17 -0500 |
| commit | dcc61cc1ff5865e57724a48c9677daf0f8bfd570 (patch) | |
| tree | e89ef183a102d41618f9240e18785a0e6c498acc /drivers/tty | |
| parent | 4bb0e2811b9c00295e3020a6dc35b918502de213 (diff) | |
| parent | 5054319d9fe56ed1ef6c83c00ae37fdc2b277a79 (diff) | |
Merge tag 'v3.10.65' into v3.10-rt
This is the 3.10.65 stable release
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/samsung.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c index 0c8a9fa2be6c..b8366b154fb9 100644 --- a/drivers/tty/serial/samsung.c +++ b/drivers/tty/serial/samsung.c @@ -534,11 +534,15 @@ static void s3c24xx_serial_pm(struct uart_port *port, unsigned int level, unsigned int old) { struct s3c24xx_uart_port *ourport = to_ourport(port); + int timeout = 10000; ourport->pm_level = level; switch (level) { case 3: + while (--timeout && !s3c24xx_serial_txempty_nofifo(port)) + udelay(100); + if (!IS_ERR(ourport->baudclk)) clk_disable_unprepare(ourport->baudclk); |