| Message ID | 1416236863-20898-1-git-send-email-dbaryshkov@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Nov 17, 2014 at 06:07:39PM +0300, Dmitry Eremin-Solenikov wrote: > Change clk_enable/disable() calls to clk_prepare_enable() and > clk_disable_unprepare(). NAK. Console writes can be called from IRQs-off regions. clk_prepare() can sleep. Sleeping is not permitted with IRQs off.
diff --git a/drivers/tty/serial/pxa.c b/drivers/tty/serial/pxa.c index 21b7d8b8..2f4c329 100644 --- a/drivers/tty/serial/pxa.c +++ b/drivers/tty/serial/pxa.c @@ -647,7 +647,7 @@ serial_pxa_console_write(struct console *co, const char *s, unsigned int count) unsigned long flags; int locked = 1; - clk_enable(up->clk); + clk_prepare_enable(up->clk); local_irq_save(flags); if (up->port.sysrq) locked = 0; @@ -674,7 +674,7 @@ serial_pxa_console_write(struct console *co, const char *s, unsigned int count) if (locked) spin_unlock(&up->port.lock); local_irq_restore(flags); - clk_disable(up->clk); + clk_disable_unprepare(up->clk); }
Change clk_enable/disable() calls to clk_prepare_enable() and clk_disable_unprepare(). Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> --- drivers/tty/serial/pxa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)