Ver código fonte

usbip: vhci_hcd: only return urb at enqueue when served

We handle USB_REQ_SET_ADDRESS at enqueue, so we want to perform
cleanup and giveback the urb. We should not call usb_hcd_giveback_urb
when we're cleaning up after a failed enqueue, though.

Only giveback the urb at cleanup when we claim to have served it.

Signed-off-by: Igor Kotrasinski <i.kotrasinsk@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Igor Kotrasinski 10 anos atrás
pai
commit
03b0a52822
1 arquivos alterados com 3 adições e 1 exclusões
  1. 3 1
      drivers/usb/usbip/vhci_hcd.c

+ 3 - 1
drivers/usb/usbip/vhci_hcd.c

@@ -565,7 +565,9 @@ no_need_xmit:
 	usb_hcd_unlink_urb_from_ep(hcd, urb);
 	usb_hcd_unlink_urb_from_ep(hcd, urb);
 no_need_unlink:
 no_need_unlink:
 	spin_unlock(&the_controller->lock);
 	spin_unlock(&the_controller->lock);
-	usb_hcd_giveback_urb(vhci_to_hcd(the_controller), urb, urb->status);
+	if (!ret)
+		usb_hcd_giveback_urb(vhci_to_hcd(the_controller),
+				     urb, urb->status);
 	return ret;
 	return ret;
 }
 }