From f1acc3a88ae777bd54afe3f662e03783d794d5ec Mon Sep 17 00:00:00 2001 From: Haojun Bao Date: Thu, 17 Jan 2013 00:01:51 -0800 Subject: [PATCH] --- yaml --- r: 354814 b: refs/heads/master c: ed35e09248c12d246b49b6b3ce9fdcec8a5badb6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/pxa.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e20d0735f7b6..ef5d05796eb2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b786337d8c2867962348711e8d1211b292b6e3c5 +refs/heads/master: ed35e09248c12d246b49b6b3ce9fdcec8a5badb6 diff --git a/trunk/drivers/tty/serial/pxa.c b/trunk/drivers/tty/serial/pxa.c index 3b671bc3f966..a67f9e156ada 100644 --- a/trunk/drivers/tty/serial/pxa.c +++ b/trunk/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