lkml.org 
[lkml]   [2012]   [Nov]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 250/270] USB: mos7840: remove NULL-urb submission
    Date
    3.5.7u1 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Johan Hovold <jhovold@gmail.com>

    commit 28c3ae9a8cf45f439c9a0779ebd0256e2ae72813 upstream.

    The private int_urb is never allocated so the submission from the
    control completion handler will always fail. Remove this odd piece of
    broken code.

    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    [ herton: adjusted context ]
    Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
    ---
    drivers/usb/serial/mos7840.c | 15 +--------------
    1 file changed, 1 insertion(+), 14 deletions(-)

    diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
    index f717db4..eab84c1 100644
    --- a/drivers/usb/serial/mos7840.c
    +++ b/drivers/usb/serial/mos7840.c
    @@ -219,7 +219,6 @@ struct moschip_port {
    int port_num; /*Actual port number in the device(1,2,etc) */
    struct urb *write_urb; /* write URB for this port */
    struct urb *read_urb; /* read URB for this port */
    - struct urb *int_urb;
    __u8 shadowLCR; /* last LCR value received */
    __u8 shadowMCR; /* last MCR value received */
    char open;
    @@ -494,7 +493,6 @@ static void mos7840_control_callback(struct urb *urb)
    unsigned char *data;
    struct moschip_port *mos7840_port;
    __u8 regval = 0x0;
    - int result = 0;
    int status = urb->status;

    mos7840_port = urb->context;
    @@ -513,7 +511,7 @@ static void mos7840_control_callback(struct urb *urb)
    default:
    dbg("%s - nonzero urb status received: %d", __func__,
    status);
    - goto exit;
    + return;
    }

    dbg("%s urb buffer size is %d", __func__, urb->actual_length);
    @@ -526,17 +524,6 @@ static void mos7840_control_callback(struct urb *urb)
    mos7840_handle_new_msr(mos7840_port, regval);
    else if (mos7840_port->MsrLsr == 1)
    mos7840_handle_new_lsr(mos7840_port, regval);
    -
    -exit:
    - spin_lock(&mos7840_port->pool_lock);
    - if (!mos7840_port->zombie)
    - result = usb_submit_urb(mos7840_port->int_urb, GFP_ATOMIC);
    - spin_unlock(&mos7840_port->pool_lock);
    - if (result) {
    - dev_err(&urb->dev->dev,
    - "%s - Error %d submitting interrupt urb\n",
    - __func__, result);
    - }
    }

    static int mos7840_get_reg(struct moschip_port *mcs, __u16 Wval, __u16 reg,
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2012-11-26 19:21    [W:4.170 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site