BackPup/Linux
1
0 Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-10-07 05:31:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

serial: fix port type conflict between NS16550A & U6_16550A

Browse Source 
Bug seen by Dr. David Alan Gilbert with sparse

Signed-off-by: Philippe Langlais <[email protected]>
Cc: stable <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
Philippe Langlais authored and Greg Kroah-Hartman committed 2010-09-03 17:29:04 -07:00
1 parent d86b3001a1
commit 71cad05549
2 files changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/linux/serial.h
+1 -2
View File
@@ -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
include/linux/serial_core.h
+2 -1
View File
@@ -44,7 +44,8 @@
#define PORT_RM9000 16 /* PMC-Sierra RM9xxx internal UART */
#define PORT_OCTEON 17 /* Cavium OCTEON internal UART */
#define PORT_AR7 18 /* Texas Instruments AR7 internal UART */
#define PORT_MAX_8250 18 /* max port ID */
#define PORT_U6_16550A 19 /* ST-Ericsson U6xxx internal UART */
#define PORT_MAX_8250 19 /* max port ID */
/*
* ARM specific type numbers. These are not currently guaranteed