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

Commit 35f349ee authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 82c9df82 f02aa3f9

drivers/serial/pxa.c

+2 −2
Original line number Diff line number Diff line
@@ -641,7 +641,7 @@ serial_pxa_console_write(struct console *co, const char *s, unsigned int count) 
	int i;



	/*

	 *	First save the UER then disable the interrupts

	 *	First save the IER then disable the interrupts

	 */

	ier = serial_in(up, UART_IER);

	serial_out(up, UART_IER, UART_IER_UUE);