diff options
| author | Colin Leitner <colin.leitner@googlemail.com> | 2013-11-08 22:52:34 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-01-03 04:33:28 +0000 |
| commit | f702d75487c72e1b4aabce4a34064b7e1853f1e6 (patch) | |
| tree | f0a9d80118a2cfb22feda7b1bcc43af981e6d132 /drivers/usb/serial/mos7840.c | |
| parent | 481a741aeb74f6051a4f06cd7517d7cf1848f216 (diff) | |
| download | kernel_samsung_smdk4412-f702d75487c72e1b4aabce4a34064b7e1853f1e6.zip kernel_samsung_smdk4412-f702d75487c72e1b4aabce4a34064b7e1853f1e6.tar.gz kernel_samsung_smdk4412-f702d75487c72e1b4aabce4a34064b7e1853f1e6.tar.bz2 | |
USB: mos7840: correct handling of CS5 setting
commit 78692cc3382e0603a47e1f2aaeffe0d99891994d upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/usb/serial/mos7840.c')
| -rw-r--r-- | drivers/usb/serial/mos7840.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c index 4c06746..80fc40a 100644 --- a/drivers/usb/serial/mos7840.c +++ b/drivers/usb/serial/mos7840.c @@ -1987,25 +1987,25 @@ static void mos7840_change_port_settings(struct tty_struct *tty, iflag = tty->termios->c_iflag; /* Change the number of bits */ - if (cflag & CSIZE) { - switch (cflag & CSIZE) { - case CS5: - lData = LCR_BITS_5; - break; + switch (cflag & CSIZE) { + case CS5: + lData = LCR_BITS_5; + break; - case CS6: - lData = LCR_BITS_6; - break; + case CS6: + lData = LCR_BITS_6; + break; - case CS7: - lData = LCR_BITS_7; - break; - default: - case CS8: - lData = LCR_BITS_8; - break; - } + case CS7: + lData = LCR_BITS_7; + break; + + default: + case CS8: + lData = LCR_BITS_8; + break; } + /* Change the Parity bit */ if (cflag & PARENB) { if (cflag & PARODD) { |