Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 354814
b: refs/heads/master
c: ed35e09
h: refs/heads/master
v: v3
  • Loading branch information
Haojun Bao authored and Greg Kroah-Hartman committed Jan 18, 2013
1 parent a840c4e commit f1acc3a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b786337d8c2867962348711e8d1211b292b6e3c5
refs/heads/master: ed35e09248c12d246b49b6b3ce9fdcec8a5badb6
2 changes: 0 additions & 2 deletions trunk/drivers/tty/serial/pxa.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit f1acc3a

Please sign in to comment.