lkml.org 
[lkml]   [2013]   [Sep]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[211/251] USB-Serial: Fix error handling of usb_wwan
    3.6.11.9-rc1 stable review patch.
    If anyone has any objections, please let me know.

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

    From: Matt Burtch <matt@grid-net.com>

    [ Upstream commit 6c1ee66a0b2bdbd64c078fba684d640cf2fd38a9 ]

    This fixes an issue where the bulk-in urb used for incoming data transfer
    is not resubmitted if the packet recieved contains an error status. This
    results in the driver locking until the port is closed and re-opened.

    Tested on a custom board with a Cinterion GSM module.

    Signed-off-by: Matt Burtch <matt@grid-net.com>
    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    ---
    drivers/usb/serial/usb_wwan.c | 20 ++++++++++----------
    1 file changed, 10 insertions(+), 10 deletions(-)

    diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c
    index 188b5b3..5e9e1df 100644
    --- a/drivers/usb/serial/usb_wwan.c
    +++ b/drivers/usb/serial/usb_wwan.c
    @@ -299,18 +299,18 @@ static void usb_wwan_indat_callback(struct urb *urb)
    tty_kref_put(tty);
    }

    - /* Resubmit urb so we continue receiving */
    - err = usb_submit_urb(urb, GFP_ATOMIC);
    - if (err) {
    - if (err != -EPERM) {
    - printk(KERN_ERR "%s: resubmit read urb failed. "
    - "(%d)", __func__, err);
    - /* busy also in error unless we are killed */
    - usb_mark_last_busy(port->serial->dev);
    - }
    - } else {
    + }
    + /* Resubmit urb so we continue receiving */
    + err = usb_submit_urb(urb, GFP_ATOMIC);
    + if (err) {
    + if (err != -EPERM) {
    + printk(KERN_ERR "%s: resubmit read urb failed. (%d)\n",
    + __func__, err);
    + /* busy also in error unless we are killed */
    usb_mark_last_busy(port->serial->dev);
    }
    + } else {
    + usb_mark_last_busy(port->serial->dev);
    }
    }

    --
    1.7.10.4



    \
     
     \ /
      Last update: 2013-09-11 07:21    [W:4.131 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site