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

Commit 71cad055 authored by Philippe Langlais's avatar Philippe Langlais Committed by Greg Kroah-Hartman
Browse files

serial: fix port type conflict between NS16550A & U6_16550A 



Bug seen by Dr. David Alan Gilbert with sparse

Signed-off-by: default avatarPhilippe Langlais <philippe.langlais@stericsson.com>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d86b3001

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

include/linux/serial_core.h

+2 −1
Original line number Diff line number Diff line
@@ -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