aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/8250.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 201c3b9924f4..218b69372c0b 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -1065,8 +1065,10 @@ receive_chars(struct uart_8250_port *up, int *status, struct pt_regs *regs)
1065 tty_flip_buffer_push(tty); 1065 tty_flip_buffer_push(tty);
1066 spin_lock(&up->port.lock); 1066 spin_lock(&up->port.lock);
1067 } 1067 }
1068 /* If this failed then we will throw away the 1068 /*
1069 bytes but must do so to clear interrupts */ 1069 * If this failed then we will throw away the
1070 * bytes but must do so to clear interrupts
1071 */
1070 } 1072 }
1071 ch = serial_inp(up, UART_RX); 1073 ch = serial_inp(up, UART_RX);
1072 flag = TTY_NORMAL; 1074 flag = TTY_NORMAL;
@@ -1106,7 +1108,7 @@ receive_chars(struct uart_8250_port *up, int *status, struct pt_regs *regs)
1106 up->port.icount.overrun++; 1108 up->port.icount.overrun++;
1107 1109
1108 /* 1110 /*
1109 * Mask off conditions which should be ingored. 1111 * Mask off conditions which should be ignored.
1110 */ 1112 */
1111 lsr &= up->port.read_status_mask; 1113 lsr &= up->port.read_status_mask;
1112 1114
@@ -2570,6 +2572,9 @@ MODULE_ALIAS_CHARDEV_MAJOR(TTY_MAJOR);
2570 * If this fails an error is returned. 2572 * If this fails an error is returned.
2571 * 2573 *
2572 * On success the port is ready to use and the line number is returned. 2574 * On success the port is ready to use and the line number is returned.
2575 *
2576 * Note: this function is deprecated - use serial8250_register_port
2577 * instead.
2573 */ 2578 */
2574int register_serial(struct serial_struct *req) 2579int register_serial(struct serial_struct *req)
2575{ 2580{
@@ -2624,6 +2629,9 @@ EXPORT_SYMBOL(register_serial);
2624 * 2629 *
2625 * Remove one serial port. This may not be called from interrupt 2630 * Remove one serial port. This may not be called from interrupt
2626 * context. We hand the port back to our local PM control. 2631 * context. We hand the port back to our local PM control.
2632 *
2633 * Note: this function is deprecated - use serial8250_unregister_port
2634 * instead.
2627 */ 2635 */
2628void unregister_serial(int line) 2636void unregister_serial(int line)
2629{ 2637{