serial: pxa: Do not tweak clock in pxa serial write() function

The write() function could be used by printk(), which is atomic and
tweaking clock there can cause "BUG: sleeping function called from
invalid context".

Signed-off-by: Bao Haojun <hjbao@marvell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Haojun Bao 2013-01-17 00:01:51 -08:00 коммит произвёл Greg Kroah-Hartman
Родитель b786337d8c
Коммит ed35e09248
1 изменённых файлов: 0 добавлений и 2 удалений

Просмотреть файл

@ -672,7 +672,6 @@ serial_pxa_console_write(struct console *co, const char *s, unsigned int count)
unsigned long flags;
int locked = 1;
clk_prepare_enable(up->clk);
local_irq_save(flags);
if (up->port.sysrq)
@ -701,7 +700,6 @@ serial_pxa_console_write(struct console *co, const char *s, unsigned int count)
spin_unlock(&up->port.lock);
local_irq_restore(flags);
clk_disable_unprepare(up->clk);
}
#ifdef CONFIG_CONSOLE_POLL