From: Peter Hurley Date: Sun, 1 Mar 2015 15:18:16 +0000 (-0500) Subject: serial: core: Fix iotype userspace breakage X-Git-Tag: v3.19.3~85 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f582a6d95acfe93c7773b66f344aa898edf64fbd;p=thirdparty%2Fkernel%2Fstable.git serial: core: Fix iotype userspace breakage 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 Signed-off-by: Peter Hurley Reviewed-by: Kevin Cernekee Signed-off-by: Greg Kroah-Hartman --- diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index 057038cf27880..b405a62d1d4be 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -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 */