openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

USB: spcp8x5: correct handling of CS5 setting 

This patch removes an erroneous check of CSIZE, which made it impossible to set
CS5.

Compiles clean, but couldn't test against hardware.

Signed-off-by: Colin Leitner <colin.leitner@gmail.com>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Colin Leitner 2013-11-08 22:53:11 +01:00 committed by Greg Kroah-Hartman
parent 471e42ad14
commit 711fbdfbf2
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/usb/serial/spcp8x5.c
View File

@ -348,22 +348,20 @@ static void spcp8x5_set_termios(struct tty_struct *tty,
} }
/* Set Data Length : 00:5bit, 01:6bit, 10:7bit, 11:8bit */ /* Set Data Length : 00:5bit, 01:6bit, 10:7bit, 11:8bit */
if (cflag & CSIZE) { switch (cflag & CSIZE) {
switch (cflag & CSIZE) { case CS5:
case CS5: buf[1] |= SET_UART_FORMAT_SIZE_5;
buf[1] |= SET_UART_FORMAT_SIZE_5; break;
break; case CS6:
case CS6: buf[1] |= SET_UART_FORMAT_SIZE_6;
buf[1] |= SET_UART_FORMAT_SIZE_6; break;
break; case CS7:
case CS7: buf[1] |= SET_UART_FORMAT_SIZE_7;
buf[1] |= SET_UART_FORMAT_SIZE_7; break;
break; default:
default: case CS8:
case CS8: buf[1] |= SET_UART_FORMAT_SIZE_8;
buf[1] |= SET_UART_FORMAT_SIZE_8; break;
break;
}
} }
/* Set Stop bit2 : 0:1bit 1:2bit */ /* Set Stop bit2 : 0:1bit 1:2bit */