lkml.org 
[lkml]   [2011]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[001/115] staging: usbip: remove double giveback of URB
    2.6.32-longterm review patch.  If anyone has any objections, please let us know.

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

    From: =?UTF-8?q?M=C3=A1rton=20N=C3=A9meth?= <nm127@freemail.hu>

    commit 7571f089d7522a95c103558faf313c7af8856ceb upstream.

    In the vhci_urb_dequeue() function the TCP connection is checked twice.
    Each time when the TCP connection is closed the URB is unlinked and given
    back. Remove the second attempt of unlinking and giving back of the URB completely.

    This patch fixes the bug described at https://bugzilla.kernel.org/show_bug.cgi?id=24872 .

    Signed-off-by: Márton Németh <nm127@freemail.hu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/staging/usbip/vhci_hcd.c | 14 --------------
    1 file changed, 14 deletions(-)

    --- a/drivers/staging/usbip/vhci_hcd.c
    +++ b/drivers/staging/usbip/vhci_hcd.c
    @@ -798,20 +798,6 @@ static int vhci_urb_dequeue(struct usb_h
    spin_unlock_irqrestore(&vdev->priv_lock, flags2);
    }

    -
    - if (!vdev->ud.tcp_socket) {
    - /* tcp connection is closed */
    - usbip_uinfo("vhci_hcd: vhci_urb_dequeue() gives back urb %p\n",
    - urb);
    -
    - usb_hcd_unlink_urb_from_ep(hcd, urb);
    -
    - spin_unlock_irqrestore(&the_controller->lock, flags);
    - usb_hcd_giveback_urb(vhci_to_hcd(the_controller), urb,
    - urb->status);
    - spin_lock_irqsave(&the_controller->lock, flags);
    - }
    -
    spin_unlock_irqrestore(&the_controller->lock, flags);

    usbip_dbg_vhci_hc("leave\n");

    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2011-02-16 02:53    [W:4.200 / U:0.508 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site