| From 7571f089d7522a95c103558faf313c7af8856ceb Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?M=C3=A1rton=20N=C3=A9meth?= <nm127@freemail.hu> |
| Date: Mon, 13 Dec 2010 21:59:09 +0100 |
| Subject: staging: usbip: remove double giveback of URB |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| 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"); |