diff options
author | Haojun Bao <hjbao@marvell.com> | 2013-01-17 03:01:51 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-17 20:31:24 -0500 |
commit | ed35e09248c12d246b49b6b3ce9fdcec8a5badb6 (patch) | |
tree | 25adfb8e34a261391be88aa0f928cf1309a05bab /drivers/tty/serial | |
parent | b786337d8c2867962348711e8d1211b292b6e3c5 (diff) |
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>
Diffstat (limited to 'drivers/tty/serial')
-rw-r--r-- | drivers/tty/serial/pxa.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/tty/serial/pxa.c b/drivers/tty/serial/pxa.c index 3b671bc3f966..a67f9e156ada 100644 --- a/drivers/tty/serial/pxa.c +++ b/drivers/tty/serial/pxa.c | |||
@@ -672,7 +672,6 @@ serial_pxa_console_write(struct console *co, const char *s, unsigned int count) | |||
672 | unsigned long flags; | 672 | unsigned long flags; |
673 | int locked = 1; | 673 | int locked = 1; |
674 | 674 | ||
675 | clk_prepare_enable(up->clk); | ||
676 | 675 | ||
677 | local_irq_save(flags); | 676 | local_irq_save(flags); |
678 | if (up->port.sysrq) | 677 | if (up->port.sysrq) |
@@ -701,7 +700,6 @@ serial_pxa_console_write(struct console *co, const char *s, unsigned int count) | |||
701 | spin_unlock(&up->port.lock); | 700 | spin_unlock(&up->port.lock); |
702 | local_irq_restore(flags); | 701 | local_irq_restore(flags); |
703 | 702 | ||
704 | clk_disable_unprepare(up->clk); | ||
705 | } | 703 | } |
706 | 704 | ||
707 | #ifdef CONFIG_CONSOLE_POLL | 705 | #ifdef CONFIG_CONSOLE_POLL |