Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
tty/of_serial: add missing ns16550a id
bcm63xx_uart: Fix serial driver compile breakage.
tty_port: handle the nonblocking open of a dead port corner case
+8
-4
+5
-2
drivers/char/tty_port.c
+5
-2
drivers/char/tty_port.c
···
219
219
220
220
/* if non-blocking mode is set we can pass directly to open unless
221
221
the port has just hung up or is in another error state */
222
-
if ((filp->f_flags & O_NONBLOCK) ||
223
-
(tty->flags & (1 << TTY_IO_ERROR))) {
222
+
if (tty->flags & (1 << TTY_IO_ERROR)) {
223
+
port->flags |= ASYNC_NORMAL_ACTIVE;
224
+
return 0;
225
+
}
226
+
if (filp->f_flags & O_NONBLOCK) {
224
227
/* Indicate we are open */
225
228
if (tty->termios->c_cflag & CBAUD)
226
229
tty_port_raise_dtr_rts(port);
+2
-2
drivers/serial/bcm63xx_uart.c
+2
-2
drivers/serial/bcm63xx_uart.c
···
242
242
* higher than fifo size anyway since we're much faster than
243
243
* serial port */
244
244
max_count = 32;
245
-
tty = port->info->port.tty;
245
+
tty = port->state->port.tty;
246
246
do {
247
247
unsigned int iestat, c, cstat;
248
248
char flag;
···
318
318
return;
319
319
}
320
320
321
-
xmit = &port->info->xmit;
321
+
xmit = &port->state->xmit;
322
322
if (uart_circ_empty(xmit))
323
323
goto txq_empty;
324
324
+1
drivers/serial/of_serial.c
+1
drivers/serial/of_serial.c
···
161
161
static struct of_device_id __devinitdata of_platform_serial_table[] = {
162
162
{ .type = "serial", .compatible = "ns8250", .data = (void *)PORT_8250, },
163
163
{ .type = "serial", .compatible = "ns16450", .data = (void *)PORT_16450, },
164
+
{ .type = "serial", .compatible = "ns16550a", .data = (void *)PORT_16550A, },
164
165
{ .type = "serial", .compatible = "ns16550", .data = (void *)PORT_16550, },
165
166
{ .type = "serial", .compatible = "ns16750", .data = (void *)PORT_16750, },
166
167
{ .type = "serial", .compatible = "ns16850", .data = (void *)PORT_16850, },