]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
serial: core: Fix iotype userspace breakage
authorPeter Hurley <peter@hurleysoftware.com>
Sun, 1 Mar 2015 15:18:16 +0000 (10:18 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 26 Mar 2015 12:59:39 +0000 (13:59 +0100)
commit 2bb785169e9709d41220e5c18b0270883a82f85c upstream.

commit 3ffb1a8193bea ("serial: core: Add big-endian iotype")
re-numbered userspace-dependent values; ioctl(TIOCSSERIAL) can
assign the port iotype (which is expected to match the selected
i/o accessors), so iotype values must not be changed.

Cc: Kevin Cernekee <cernekee@gmail.com>
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Reviewed-by: Kevin Cernekee <cernekee@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
include/linux/serial_core.h

index 057038cf27880d34a17e428fb51baccf563692c2..b405a62d1d4be1e236862fb4c46ffb5ba62b4809 100644 (file)
@@ -146,9 +146,9 @@ struct uart_port {
 #define UPIO_HUB6              (1)                     /* Hub6 ISA card */
 #define UPIO_MEM               (2)                     /* 8b MMIO access */
 #define UPIO_MEM32             (3)                     /* 32b little endian */
-#define UPIO_MEM32BE           (4)                     /* 32b big endian */
-#define UPIO_AU                        (5)                     /* Au1x00 and RT288x type IO */
-#define UPIO_TSI               (6)                     /* Tsi108/109 type IO */
+#define UPIO_AU                        (4)                     /* Au1x00 and RT288x type IO */
+#define UPIO_TSI               (5)                     /* Tsi108/109 type IO */
+#define UPIO_MEM32BE           (6)                     /* 32b big endian */
 
        unsigned int            read_status_mask;       /* driver specific */
        unsigned int            ignore_status_mask;     /* driver specific */