Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edaa4d66 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 

* 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
  n_gsm: Fix length handling
  n_gsm: Copy n2 over when configuring via ioctl interface
  serial: bfin_5xx: grab port lock before making port termios changes
  serial: bfin_5xx: disable CON_PRINTBUFFER for consoles
  serial: bfin_5xx: remove redundant SSYNC to improve TX speed
  serial: bfin_5xx: always include DMA headers
  vcs: make proper usage of the poll flags
  amiserial: Remove unused variable icount
  8250: Fix tcsetattr to avoid ioctl(TIOCMIWAIT) hang
  tty_ldisc: Fix BUG() on hangup
  TTY: restore tty_ldisc_wait_idle
  SERIAL: blacklist si3052 chip
  drivers/serial/bfin_5xx.c: Fix line continuation defects
  tty: prevent DOS in the flush_to_ldisc
  8250: add support for Kouwell KW-L221N-2
  nozomi: Fix warning from the previous TIOCGCOUNT changes
  tty: fix warning in synclink driver
  tty: Fix formatting in tty.h
  tty: the development tree is now done in git
parents 891cbd30 40e3465d

MAINTAINERS

+2 −2
Original line number Original line Diff line number Diff line
@@ -161,7 +161,7 @@ M: Greg Kroah-Hartman <gregkh@suse.de> 
L:	linux-serial@vger.kernel.org

L:	linux-serial@vger.kernel.org

W:	http://serial.sourceforge.net

W:	http://serial.sourceforge.net

S:	Maintained

S:	Maintained

T:	quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git

F:	drivers/serial/8250*

F:	drivers/serial/8250*

F:	include/linux/serial_8250.h

F:	include/linux/serial_8250.h
@@ -5910,7 +5910,7 @@ S: Maintained 
TTY LAYER

TTY LAYER

M:	Greg Kroah-Hartman <gregkh@suse.de>

M:	Greg Kroah-Hartman <gregkh@suse.de>

S:	Maintained

S:	Maintained

T:	quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git

F:	drivers/char/tty_*

F:	drivers/char/tty_*

F:	drivers/serial/serial_core.c

F:	drivers/serial/serial_core.c

F:	include/linux/serial_core.h

F:	include/linux/serial_core.h

drivers/char/amiserial.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -1299,7 +1299,6 @@ static int rs_ioctl(struct tty_struct *tty, struct file * file, 
{

{

	struct async_struct * info = tty->driver_data;

	struct async_struct * info = tty->driver_data;

	struct async_icount cprev, cnow;	/* kernel counter temps */

	struct async_icount cprev, cnow;	/* kernel counter temps */

	struct serial_icounter_struct icount;

	void __user *argp = (void __user *)arg;

	void __user *argp = (void __user *)arg;

	unsigned long flags;

	unsigned long flags;

drivers/char/nozomi.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -1828,7 +1828,6 @@ static int ntty_ioctl(struct tty_struct *tty, struct file *file, 
		      unsigned int cmd, unsigned long arg)

		      unsigned int cmd, unsigned long arg)

{

{

	struct port *port = tty->driver_data;

	struct port *port = tty->driver_data;

	void __user *argp = (void __user *)arg;

	int rval = -ENOIOCTLCMD;

	int rval = -ENOIOCTLCMD;





	DBG1("******** IOCTL, cmd: %d", cmd);

	DBG1("******** IOCTL, cmd: %d", cmd);

drivers/char/pcmcia/synclink_cs.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -2796,6 +2796,7 @@ static const struct tty_operations mgslpc_ops = { 
	.hangup = mgslpc_hangup,

	.hangup = mgslpc_hangup,

	.tiocmget = tiocmget,

	.tiocmget = tiocmget,

	.tiocmset = tiocmset,

	.tiocmset = tiocmset,

	.get_icount = mgslpc_get_icount,

	.proc_fops = &mgslpc_proc_fops,

	.proc_fops = &mgslpc_proc_fops,

};

};

drivers/serial/8250.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -2343,7 +2343,10 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, 




	/*

	/*

	 * CTS flow control flag and modem status interrupts

	 * CTS flow control flag and modem status interrupts

	 * Only disable MSI if no threads are waiting in

	 * serial_core::uart_wait_modem_status

	 */

	 */

	if (!waitqueue_active(&up->port.state->port.delta_msr_wait))

		up->ier &= ~UART_IER_MSI;

		up->ier &= ~UART_IER_MSI;

	if (!(up->bugs & UART_BUG_NOMSR) &&

	if (!(up->bugs & UART_BUG_NOMSR) &&

			UART_ENABLE_MS(&up->port, termios->c_cflag))

			UART_ENABLE_MS(&up->port, termios->c_cflag))