lkml.org 
[lkml]   [2012]   [Feb]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[85/89] USB: cp210x: fix up set_termios variables
    3.2-stable review patch.  If anyone has any objections, please let me know.

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

    From: Johan Hovold <jhovold@gmail.com>

    commit 34b76fcaee574017862ea3fa0efdcd77a9d0e57d upstream.

    [Based on a patch from Johan, mangled by gregkh to keep things in line]

    Fix up the variable usage in the set_termios call.

    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    Cc: Preston Fick <preston.fick@silabs.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/usb/serial/cp210x.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    --- a/drivers/usb/serial/cp210x.c
    +++ b/drivers/usb/serial/cp210x.c
    @@ -576,7 +576,8 @@ static void cp210x_set_termios(struct tt
    struct usb_serial_port *port, struct ktermios *old_termios)
    {
    unsigned int cflag, old_cflag;
    - unsigned int baud = 0, bits;
    + u32 baud;
    + unsigned int bits;
    unsigned int modem_ctl[4];

    dbg("%s - port %d", __func__, port->number);
    @@ -593,7 +594,7 @@ static void cp210x_set_termios(struct tt
    if (baud != tty_termios_baud_rate(old_termios) && baud != 0) {
    dbg("%s - Setting baud rate to %d baud", __func__,
    baud);
    - if (cp210x_set_config(port, CP210X_SET_BAUDRATE, &baud, 4)) {
    + if (cp210x_set_config(port, CP210X_SET_BAUDRATE, &baud, sizeof(baud))) {
    dbg("Baud rate requested not supported by device");
    baud = tty_termios_baud_rate(old_termios);
    }



    \
     
     \ /
      Last update: 2012-02-01 22:25    [W:0.023 / U:0.200 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site