From 9af4f8d6d99855ac396a4a8c77552b62cb744e22 Mon Sep 17 00:00:00 2001 From: Alexander Shiyan Date: Sun, 14 Oct 2012 11:05:29 +0400 Subject: [PATCH] --- yaml --- r: 338373 b: refs/heads/master c: ec335526b4bce21f6777d3917d6d67c16009ec63 h: refs/heads/master i: 338371: eaf87ded01a079bbdf23fc4e6d0b2d6854d1b86d v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/clps711x.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f5154f00b028..b203a0daa6ee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1593daf9a84f4b29e90027e0999c93da1d25478b +refs/heads/master: ec335526b4bce21f6777d3917d6d67c16009ec63 diff --git a/trunk/drivers/tty/serial/clps711x.c b/trunk/drivers/tty/serial/clps711x.c index 7b0e539ee9c0..73505c1edc7d 100644 --- a/trunk/drivers/tty/serial/clps711x.c +++ b/trunk/drivers/tty/serial/clps711x.c @@ -218,12 +218,14 @@ static void clps711xuart_break_ctl(struct uart_port *port, int break_state) unsigned int ubrlcr; spin_lock_irqsave(&port->lock, flags); + ubrlcr = clps_readl(UBRLCR(port)); - if (break_state == -1) + if (break_state) ubrlcr |= UBRLCR_BREAK; else ubrlcr &= ~UBRLCR_BREAK; clps_writel(ubrlcr, UBRLCR(port)); + spin_unlock_irqrestore(&port->lock, flags); }