Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325712
b: refs/heads/master
c: 9303ac1
h: refs/heads/master
v: v3
  • Loading branch information
Sachin Kamat authored and Greg Kroah-Hartman committed Sep 5, 2012
1 parent eb38385 commit e1ab28b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: d20925e1e4fbd501754efad5401040d700fae4d6
refs/heads/master: 9303ac158fcd5f69c032e06391a9a12d3ccb343e
6 changes: 3 additions & 3 deletions trunk/drivers/tty/serial/samsung.c
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ static inline const char *s3c24xx_serial_portname(struct uart_port *port)

static int s3c24xx_serial_txempty_nofifo(struct uart_port *port)
{
return (rd_regl(port, S3C2410_UTRSTAT) & S3C2410_UTRSTAT_TXE);
return rd_regl(port, S3C2410_UTRSTAT) & S3C2410_UTRSTAT_TXE;
}

/*
Expand Down Expand Up @@ -268,7 +268,7 @@ s3c24xx_serial_rx_chars(int irq, void *dev_id)
dbg("break!\n");
port->icount.brk++;
if (uart_handle_break(port))
goto ignore_char;
goto ignore_char;
}

if (uerstat & S3C2410_UERSTAT_FRAME)
Expand Down Expand Up @@ -1129,7 +1129,7 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
ourport->rx_irq = ret;
ourport->tx_irq = ret + 1;
}

ret = platform_get_irq(platdev, 1);
if (ret > 0)
ourport->tx_irq = ret;
Expand Down

0 comments on commit e1ab28b

Please sign in to comment.