lkml.org 
[lkml]   [2014]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.4 076/134] USB: spcp8x5: fix device initialisation at open
    Date
    3.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: Johan Hovold <jhovold@gmail.com>

    commit 5e4211f1c47560c36a8b3d4544dfd866dcf7ccd0 upstream.

    Do not use uninitialised termios data to determine when to configure the
    device at open.

    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    [bwh: Backported to 3.2: tty_struct::termios is a pointer, not a struct]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Cc: Yang Yingliang <yangyingliang@huawei.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/usb/serial/spcp8x5.c | 10 ++++------
    1 file changed, 4 insertions(+), 6 deletions(-)

    --- a/drivers/usb/serial/spcp8x5.c
    +++ b/drivers/usb/serial/spcp8x5.c
    @@ -337,7 +337,6 @@ static void spcp8x5_set_termios(struct t
    struct spcp8x5_private *priv = usb_get_serial_port_data(port);
    unsigned long flags;
    unsigned int cflag = tty->termios->c_cflag;
    - unsigned int old_cflag = old_termios->c_cflag;
    unsigned short uartdata;
    unsigned char buf[2] = {0, 0};
    int baud;
    @@ -346,15 +345,15 @@ static void spcp8x5_set_termios(struct t


    /* check that they really want us to change something */
    - if (!tty_termios_hw_change(tty->termios, old_termios))
    + if (old_termios && !tty_termios_hw_change(tty->termios, old_termios))
    return;

    /* set DTR/RTS active */
    spin_lock_irqsave(&priv->lock, flags);
    control = priv->line_control;
    - if ((old_cflag & CBAUD) == B0) {
    + if (old_termios && (old_termios->c_cflag & CBAUD) == B0) {
    priv->line_control |= MCR_DTR;
    - if (!(old_cflag & CRTSCTS))
    + if (!(old_termios->c_cflag & CRTSCTS))
    priv->line_control |= MCR_RTS;
    }
    if (control != priv->line_control) {
    @@ -442,7 +441,6 @@ static void spcp8x5_set_termios(struct t
    * status of the device. */
    static int spcp8x5_open(struct tty_struct *tty, struct usb_serial_port *port)
    {
    - struct ktermios tmp_termios;
    struct usb_serial *serial = port->serial;
    struct spcp8x5_private *priv = usb_get_serial_port_data(port);
    int ret;
    @@ -465,7 +463,7 @@ static int spcp8x5_open(struct tty_struc

    /* Setup termios */
    if (tty)
    - spcp8x5_set_termios(tty, port, &tmp_termios);
    + spcp8x5_set_termios(tty, port, NULL);

    spcp8x5_get_msr(serial->dev, &status, priv->type);




    \
     
     \ /
      Last update: 2014-04-10 07:21    [W:4.078 / U:0.276 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site