diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-16 22:06:35 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-16 22:06:35 +0000 |
| commit | c293f79246d7cdaf6e75b40aa1f957eb8d195835 (patch) | |
| tree | 2559c41e0baa8e0f160ce033e1b4c245d0ce0dcf /drivers/tty | |
| parent | 2156eda2aafa0b0f660656246a11d7c2a9947ff9 (diff) | |
| parent | 5054319d9fe56ed1ef6c83c00ae37fdc2b277a79 (diff) | |
Merge tag 'v3.10.65' into linux-linaro-lsk
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 aaa0df1f2fc6..4522aac4449b 100644 --- a/drivers/tty/serial/samsung.c +++ b/drivers/tty/serial/samsung.c @@ -537,11 +537,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); |