patch-2.3.27 linux/drivers/char/serial.c

Next file: linux/drivers/char/stradis.c
Previous file: linux/drivers/char/saa7146reg.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.26/linux/drivers/char/serial.c linux/drivers/char/serial.c
@@ -3457,11 +3457,13 @@
 	}
 	if (state->type == PORT_16550A) {
 		/* Check for Oxford Semiconductor 16C950 */
+		unsigned char scratch4;
+
 		scratch = serial_icr_read(info, UART_ID1);
-		scratch2 = serial_icr_read(info, UART_ID2);
+		scratch4 = serial_icr_read(info, UART_ID2);
 		scratch3 = serial_icr_read(info, UART_ID3);
 		
-		if (scratch == 0x16 && scratch2 == 0xC9 &&
+		if (scratch == 0x16 && scratch4 == 0xC9 &&
 		    (scratch3 == 0x50 || scratch3 == 0x52 ||
 		     scratch3 == 0x54)) {
 			state->type = PORT_16C950;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)