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

Commit 608a5ffc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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: fix tty_line must not be equal to number of allocated tty pointers in tty driver
  serial: bfin_sport_uart: restore transmit frame sync fix
  serial: fix port type conflict between NS16550A & U6_16550A
  MAINTAINERS: orphan isicom
  vt: Fix console corruption on driver hand-over.
parents 78f220a8 6eb68d6f

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -3923,8 +3923,7 @@ F: Documentation/sound/oss/MultiSound 
F:	sound/oss/msnd*



MULTITECH MULTIPORT CARD (ISICOM)

M:	Jiri Slaby <jirislaby@gmail.com>

S:	Maintained

S:	Orphan

F:	drivers/char/isicom.c

F:	include/linux/isicom.h

drivers/char/tty_io.c

+1 −1
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ struct tty_driver *tty_find_polling_driver(char *name, int *line) 
		if (*stp == '\0')

			stp = NULL;



		if (tty_line >= 0 && tty_line <= p->num && p->ops &&

		if (tty_line >= 0 && tty_line < p->num && p->ops &&

		    p->ops->poll_init && !p->ops->poll_init(p, tty_line, stp)) {

			res = tty_driver_kref_get(p);

			*line = tty_line;

drivers/char/vt.c

+4 −11
Original line number Diff line number Diff line
@@ -906,22 +906,16 @@ static int vc_do_resize(struct tty_struct *tty, struct vc_data *vc, 
			 * bottom of buffer

			 */

			old_origin += (old_rows - new_rows) * old_row_size;

			end = vc->vc_scr_end;

		} else {

			/*

			 * Cursor is in no man's land, copy 1/2 screenful

			 * from the top and bottom of cursor position

			 */

			old_origin += (vc->vc_y - new_rows/2) * old_row_size;

			end = old_origin + (old_row_size * new_rows);

		}

	} else

		/*

		 * Cursor near the top, copy contents from the top of buffer

		 */

		end = (old_rows > new_rows) ? old_origin +

			(old_row_size * new_rows) :

			vc->vc_scr_end;

	}



	end = old_origin + old_row_size * min(old_rows, new_rows);



	update_attr(vc);
@@ -3075,7 +3069,6 @@ static int bind_con_driver(const struct consw *csw, int first, int last, 


		old_was_color = vc->vc_can_do_color;

		vc->vc_sw->con_deinit(vc);

		if (!vc->vc_origin)

		vc->vc_origin = (unsigned long)vc->vc_screenbuf;

		visual_init(vc, i, 0);

		set_origin(vc);

drivers/serial/bfin_sport_uart.c

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static int sport_uart_setup(struct sport_uart_port *up, int size, int baud_rate) 
	unsigned int sclk = get_sclk();



	/* Set TCR1 and TCR2, TFSR is not enabled for uart */

	SPORT_PUT_TCR1(up, (ITFS | TLSBIT | ITCLK));

	SPORT_PUT_TCR1(up, (LATFS | ITFS | TFSR | TLSBIT | ITCLK));

	SPORT_PUT_TCR2(up, size + 1);

	pr_debug("%s TCR1:%x, TCR2:%x\n", __func__, SPORT_GET_TCR1(up), SPORT_GET_TCR2(up));

include/linux/serial.h

+1 −2
Original line number Diff line number Diff line
@@ -77,8 +77,7 @@ struct serial_struct { 
#define PORT_16654	11

#define PORT_16850	12

#define PORT_RSA	13	/* RSA-DV II/S card */

#define PORT_U6_16550A	14

#define PORT_MAX	14

#define PORT_MAX	13



#define SERIAL_IO_PORT	0

#define SERIAL_IO_HUB6	1