Merge "usb: gadget: cser: Requeue OUT USB requests if ECONNRESET is received" (b8cb5d94) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/usb/gadget/function/f_cdev.c

+20 −1

Original line number	Diff line number	Diff line
		@@ -986,6 +986,7 @@ static void usb_cser_read_complete(struct usb_ep ep, struct usb_request req)
		{
		struct f_cdev *port = ep->driver_data;
		unsigned long flags;
		int ret;

		pr_debug("ep:(%pK)(%s) port:%p req_status:%d req->actual:%u\n",
		ep, ep->name, port, req->status, req->actual);
		@@ -995,7 +996,25 @@ static void usb_cser_read_complete(struct usb_ep ep, struct usb_request req)
		}

		spin_lock_irqsave(&port->port_lock, flags);
		if (!port->port_open \|\| req->status \|\| !req->actual) {
		if (!port->port_open) {
		list_add_tail(&req->list, &port->read_pool);
		spin_unlock_irqrestore(&port->port_lock, flags);
		return;
		}

		if (req->status \|\| !req->actual) {
		/*
		* ECONNRESET can be returned when host issues clear EP halt,
		* restart OUT requests if so.
		*/
		if (req->status == -ECONNRESET) {
		spin_unlock_irqrestore(&port->port_lock, flags);
		ret = usb_ep_queue(ep, req, GFP_KERNEL);
		if (!ret)
		return;
		spin_lock_irqsave(&port->port_lock, flags);
		}

		list_add_tail(&req->list, &port->read_pool);
		spin_unlock_irqrestore(&port->port_lock, flags);
		return;