lkml.org 
[lkml]   [2012]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 53/69] USB: mct_u232: Fix incorrect TIOCMSET return
    3.2-stable review patch.  If anyone has any objections, please let me know.

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

    From: Alan Cox <alan@linux.intel.com>

    commit 1aa3c63cf0a79153ee13c8f82e4eb6c40b66a161 upstream.

    The low level helper returns 1 on success. The ioctl should however return
    0. As this is the only user of the helper return, make the helper return 0 or
    an error code.

    Resolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id=43009
    Signed-off-by: Alan Cox <alan@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/usb/serial/mct_u232.c | 13 ++++++++-----
    1 file changed, 8 insertions(+), 5 deletions(-)

    diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
    index d0ec1aa..a71fa0a 100644
    --- a/drivers/usb/serial/mct_u232.c
    +++ b/drivers/usb/serial/mct_u232.c
    @@ -309,13 +309,16 @@ static int mct_u232_set_modem_ctrl(struct usb_serial *serial,
    MCT_U232_SET_REQUEST_TYPE,
    0, 0, buf, MCT_U232_SET_MODEM_CTRL_SIZE,
    WDR_TIMEOUT);
    - if (rc < 0)
    - dev_err(&serial->dev->dev,
    - "Set MODEM CTRL 0x%x failed (error = %d)\n", mcr, rc);
    + kfree(buf);
    +
    dbg("set_modem_ctrl: state=0x%x ==> mcr=0x%x", control_state, mcr);

    - kfree(buf);
    - return rc;
    + if (rc < 0) {
    + dev_err(&serial->dev->dev,
    + "Set MODEM CTRL 0x%x failed (error = %d)\n", mcr, rc);
    + return rc;
    + }
    + return 0;
    } /* mct_u232_set_modem_ctrl */

    static int mct_u232_get_modem_stat(struct usb_serial *serial,



    \
     
     \ /
      Last update: 2012-06-17 21:22    [W:0.082 / U:29.008 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site