lkml.org 
[lkml]   [2013]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 117/185] USB: spcp8x5: correct handling of CS5 setting
    3.2.54-rc1 review patch.  If anyone has any objections, please let me know.

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

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

    commit 711fbdfbf2bc4827214a650afe3f64767a1aba16 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>
    ---
    drivers/usb/serial/spcp8x5.c | 30 ++++++++++++++----------------
    1 file changed, 14 insertions(+), 16 deletions(-)

    --- a/drivers/usb/serial/spcp8x5.c
    +++ b/drivers/usb/serial/spcp8x5.c
    @@ -394,22 +394,20 @@ static void spcp8x5_set_termios(struct t
    }

    /* Set Data Length : 00:5bit, 01:6bit, 10:7bit, 11:8bit */
    - if (cflag & CSIZE) {
    - switch (cflag & CSIZE) {
    - case CS5:
    - buf[1] |= SET_UART_FORMAT_SIZE_5;
    - break;
    - case CS6:
    - buf[1] |= SET_UART_FORMAT_SIZE_6;
    - break;
    - case CS7:
    - buf[1] |= SET_UART_FORMAT_SIZE_7;
    - break;
    - default:
    - case CS8:
    - buf[1] |= SET_UART_FORMAT_SIZE_8;
    - break;
    - }
    + switch (cflag & CSIZE) {
    + case CS5:
    + buf[1] |= SET_UART_FORMAT_SIZE_5;
    + break;
    + case CS6:
    + buf[1] |= SET_UART_FORMAT_SIZE_6;
    + break;
    + case CS7:
    + buf[1] |= SET_UART_FORMAT_SIZE_7;
    + break;
    + default:
    + case CS8:
    + buf[1] |= SET_UART_FORMAT_SIZE_8;
    + break;
    }

    /* Set Stop bit2 : 0:1bit 1:2bit */


    \
     
     \ /
      Last update: 2013-12-29 04:41    [W:4.075 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site