lkml.org 
[lkml]   [2013]   [Dec]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.5 074/103] USB: mos7840: correct handling of CS5 setting
    Date
    3.5.7.28 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Colin Leitner <colin.leitner@googlemail.com>

    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: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/usb/serial/mos7840.c | 32 ++++++++++++++++----------------
    1 file changed, 16 insertions(+), 16 deletions(-)

    diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
    index 08aad01..bc0fd5b 100644
    --- a/drivers/usb/serial/mos7840.c
    +++ b/drivers/usb/serial/mos7840.c
    @@ -1998,25 +1998,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) {
    --
    1.8.3.2


    \
     
     \ /
      Last update: 2013-12-17 20:01    [W:4.488 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site