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

Commit 7f729ccf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-serial

parents cbc74951 ee31b337

drivers/serial/8250.c

+4 −1
Original line number Diff line number Diff line
@@ -999,6 +999,9 @@ static void autoconfig(struct uart_8250_port *up, unsigned int probeflags) 
	serial_outp(up, UART_MCR, save_mcr);

	serial8250_clear_fifos(up);

	(void)serial_in(up, UART_RX);

	if (up->capabilities & UART_CAP_UUE)

		serial_outp(up, UART_IER, UART_IER_UUE);

	else

		serial_outp(up, UART_IER, 0);



 out:

drivers/serial/8250_pnp.c

+2 −0
Original line number Diff line number Diff line
@@ -323,6 +323,8 @@ static const struct pnp_device_id pnp_dev_table[] = { 
	{	"USR9180",		0	},

	/* U.S. Robotics 56K Voice INT PnP*/

	{	"USR9190",		0	},

	/* HP Compaq Tablet PC tc1100 Wacom tablet */

	{	"WACF005",		0	},

	/* Rockwell's (PORALiNK) 33600 INT PNP */

	{	"WCI0003",		0	},

	/* Unkown PnP modems */

drivers/serial/dz.c

+24 −24
Original line number Diff line number Diff line
@@ -645,9 +645,9 @@ static void __init dz_init_ports(void) 


	if (mips_machtype == MACH_DS23100 ||

	    mips_machtype == MACH_DS5100)

		base = (unsigned long) KN01_DZ11_BASE;

		base = CKSEG1ADDR(KN01_SLOT_BASE + KN01_DZ11);

	else

		base = (unsigned long) KN02_DZ11_BASE;

		base = CKSEG1ADDR(KN02_SLOT_BASE + KN02_DZ11);



	for (i = 0, dport = dz_ports; i < DZ_NB_PORT; i++, dport++) {

		spin_lock_init(&dport->port.lock);

drivers/serial/mpc52xx_uart.c

+2 −2
Original line number Diff line number Diff line
@@ -725,7 +725,7 @@ mpc52xx_uart_probe(struct platform_device *dev) 
	int i, idx, ret;



	/* Check validity & presence */

	idx = pdev->id;

	idx = dev->id;

	if (idx < 0 || idx >= MPC52xx_PSC_MAXNUM)

		return -EINVAL;
@@ -748,7 +748,7 @@ mpc52xx_uart_probe(struct platform_device *dev) 
	port->ops	= &mpc52xx_uart_ops;



	/* Search for IRQ and mapbase */

	for (i=0 ; i<pdev->num_resources ; i++, res++) {

	for (i=0 ; i<dev->num_resources ; i++, res++) {

		if (res->flags & IORESOURCE_MEM)

			port->mapbase = res->start;

		else if (res->flags & IORESOURCE_IRQ)

drivers/serial/sa1100.c

+1 −3
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static void sa1100_stop_tx(struct uart_port *port) 
}



/*

 * interrupts may not be disabled on entry

 * port locked and interrupts disabled

 */

static void sa1100_start_tx(struct uart_port *port)

{
@@ -164,11 +164,9 @@ static void sa1100_start_tx(struct uart_port *port) 
	unsigned long flags;

	u32 utcr3;



	spin_lock_irqsave(&sport->port.lock, flags);

	utcr3 = UART_GET_UTCR3(sport);

	sport->port.read_status_mask |= UTSR0_TO_SM(UTSR0_TFS);

	UART_PUT_UTCR3(sport, utcr3 | UTCR3_TIE);

	spin_unlock_irqrestore(&sport->port.lock, flags);

}



/*