From 5e5a44718951b38673189fba0a989374e19c5d33 Mon Sep 17 00:00:00 2001 From: Bernard Blackham Date: Thu, 6 Sep 2012 20:25:04 +1000 Subject: [PATCH] --- yaml --- r: 324935 b: refs/heads/master c: 236742de5bfd2af772004ec829518856ff12b469 h: refs/heads/master i: 324933: cc726e8f03e7b70a184e6399676ed7ea1fd5ffab 324931: d8739c81d6d1a82bbc74044c2094ea2798c0f93e 324927: 89adafa4b14aca755a89be9a6bcd035809026ce8 v: v3 --- [refs] | 2 +- trunk/drivers/staging/usbip/vhci_hcd.c | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a09a3ec577ec..ec74f5949cf2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 73295fe185e58b8c0b288fee61a8a994015ab4b2 +refs/heads/master: 236742de5bfd2af772004ec829518856ff12b469 diff --git a/trunk/drivers/staging/usbip/vhci_hcd.c b/trunk/drivers/staging/usbip/vhci_hcd.c index a5b028d074b8..fd2b21a6c20b 100644 --- a/trunk/drivers/staging/usbip/vhci_hcd.c +++ b/trunk/drivers/staging/usbip/vhci_hcd.c @@ -749,6 +749,7 @@ static void vhci_device_unlink_cleanup(struct vhci_device *vdev) { struct vhci_unlink *unlink, *tmp; + spin_lock(&the_controller->lock); spin_lock(&vdev->priv_lock); list_for_each_entry_safe(unlink, tmp, &vdev->unlink_tx, list) { @@ -757,9 +758,12 @@ static void vhci_device_unlink_cleanup(struct vhci_device *vdev) kfree(unlink); } - list_for_each_entry_safe(unlink, tmp, &vdev->unlink_rx, list) { + while (!list_empty(&vdev->unlink_rx)) { struct urb *urb; + unlink = list_first_entry(&vdev->unlink_rx, struct vhci_unlink, + list); + /* give back URB of unanswered unlink request */ pr_info("unlink cleanup rx %lu\n", unlink->unlink_seqnum); @@ -774,18 +778,24 @@ static void vhci_device_unlink_cleanup(struct vhci_device *vdev) urb->status = -ENODEV; - spin_lock(&the_controller->lock); usb_hcd_unlink_urb_from_ep(vhci_to_hcd(the_controller), urb); + + list_del(&unlink->list); + + spin_unlock(&vdev->priv_lock); spin_unlock(&the_controller->lock); usb_hcd_giveback_urb(vhci_to_hcd(the_controller), urb, urb->status); - list_del(&unlink->list); + spin_lock(&the_controller->lock); + spin_lock(&vdev->priv_lock); + kfree(unlink); } spin_unlock(&vdev->priv_lock); + spin_unlock(&the_controller->lock); } /*