Skip to contentSkip to conversation

FAILED: patch "[PATCH] usb: gadget: printer: enqueue printer's response for setup" failed to apply to 3.10-stable tree

PATCH [email protected] 1 participant 1 message Apr 30, 2015

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 3.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From eb132ccbdec5df46e29c9814adf76075ce83576b Mon Sep 17 00:00:00 2001

From: Andrzej Pietrasiewicz <[email protected]>
Date: Tue, 3 Mar 2015 10:52:05 +0100
Subject: [PATCH] usb: gadget: printer: enqueue printer's response for setup
request

Function-specific setup requests should be handled in such a way, that apart from filling in the data buffer, the requests are also actually
enqueued: if function-specific setup is called from composte_setup(), the "usb_ep_queue()" block of code in composite_setup() is skipped.

The printer function lacks this part and it results in e.g. get device id requests failing: the host expects some response, the device prepares it but does not equeue it for sending to the host, so the host finally asserts timeout.

This patch adds enqueueing the prepared responses.

Cc <[email protected]> # v3.4+
Fixes 2e87edf49227: "usb: gadget: make g_printer use composite"
drivers/usb/gadget/legacy/printer.c +9 -0
index 90545980542f..6385c198c134 100644
@@ -1031,6 +1031,15 @@ unknown:
 		break;
 	}
 	/* host either stalls (value < 0) or reports success */
+	if (value >= 0) {
+		req->length = value;
+		req->zero = value < wLength;
+		value = usb_ep_queue(cdev->gadget->ep0, req, GFP_ATOMIC);
+		if (value < 0) {
+			ERROR(dev, "%s:%d Error!\n", __func__, __LINE__);
+			req->status = 0;
+		}
+	}
 	return value;
 }