Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 196
b: refs/heads/master
c: 23907eb
h: refs/heads/master
v: v3
  • Loading branch information
Russell King authored and Linus Torvalds committed Apr 16, 2005
1 parent ef0516e commit ac6e86e
Show file tree
Hide file tree
Showing 2 changed files with 12 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: c907132d534c10b4f34a60383c8384403cb424a4
refs/heads/master: 23907eb8c22e39bcf3d7e7a35a2db1e416157adb
14 changes: 11 additions & 3 deletions trunk/drivers/serial/8250.c
Original file line number Diff line number Diff line change
Expand Up @@ -1065,8 +1065,10 @@ receive_chars(struct uart_8250_port *up, int *status, struct pt_regs *regs)
tty_flip_buffer_push(tty);
spin_lock(&up->port.lock);
}
/* If this failed then we will throw away the
bytes but must do so to clear interrupts */
/*
* If this failed then we will throw away the
* bytes but must do so to clear interrupts
*/
}
ch = serial_inp(up, UART_RX);
flag = TTY_NORMAL;
Expand Down Expand Up @@ -1106,7 +1108,7 @@ receive_chars(struct uart_8250_port *up, int *status, struct pt_regs *regs)
up->port.icount.overrun++;

/*
* Mask off conditions which should be ingored.
* Mask off conditions which should be ignored.
*/
lsr &= up->port.read_status_mask;

Expand Down Expand Up @@ -2570,6 +2572,9 @@ MODULE_ALIAS_CHARDEV_MAJOR(TTY_MAJOR);
* If this fails an error is returned.
*
* On success the port is ready to use and the line number is returned.
*
* Note: this function is deprecated - use serial8250_register_port
* instead.
*/
int register_serial(struct serial_struct *req)
{
Expand Down Expand Up @@ -2624,6 +2629,9 @@ EXPORT_SYMBOL(register_serial);
*
* Remove one serial port. This may not be called from interrupt
* context. We hand the port back to our local PM control.
*
* Note: this function is deprecated - use serial8250_unregister_port
* instead.
*/
void unregister_serial(int line)
{
Expand Down

0 comments on commit ac6e86e

Please sign in to comment.