From: Haojun Bao <hjbao@marvell.com>
Date: Thu, 17 Jan 2013 08:01:51 +0000 (-0800)
Subject: serial: pxa: Do not tweak clock in pxa serial write() function
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ed35e09248c12d246b49b6b3ce9fdcec8a5badb6;p=linux-beck.git

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>
---

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)
 	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