Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03620385 authored by Andrey Konovalov's avatar Andrey Konovalov Committed by Alistair Delva
Browse files

UPSTREAM: USB: dummy-hcd: use usb_urb_dir_in instead of usb_pipein 



(Upstream commit 6dabeb891c001c592645df2f477fed9f5d959987.)

Commit fea34091 ("USB: add direction bit to urb->transfer_flags") has
added a usb_urb_dir_in() helper function that can be used to determine
the direction of the URB. With that patch USB_DIR_IN control requests with
wLength == 0 are considered out requests by real USB HCDs. This patch
changes dummy-hcd to use the usb_urb_dir_in() helper to match that
behavior.

Signed-off-by: default avatarAndrey Konovalov <andreyknvl@google.com>
Link: https://lore.kernel.org/r/4ae9e68ebca02f08a93ac61fe065057c9a01f0a8.1571667489.git.andreyknvl@google.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarAndrey Konovalov <andreyknvl@google.com>
Bug: 147413187
Change-Id: Ia6397c15219ec53c753ce0e843603628968fc906
parent 69037507

drivers/usb/gadget/udc/dummy_hcd.c

+4 −4
Original line number Diff line number Diff line
@@ -1335,7 +1335,7 @@ static int dummy_perform_transfer(struct urb *urb, struct dummy_request *req, 
	u32 this_sg;

	bool next_sg;



	to_host = usb_pipein(urb->pipe);

	to_host = usb_urb_dir_in(urb);

	rbuf = req->req.buf + req->req.actual;



	if (!urb->num_sgs) {
@@ -1423,7 +1423,7 @@ static int transfer(struct dummy_hcd *dum_hcd, struct urb *urb, 


		/* FIXME update emulated data toggle too */



		to_host = usb_pipein(urb->pipe);

		to_host = usb_urb_dir_in(urb);

		if (unlikely(len == 0))

			is_short = 1;

		else {
@@ -1844,7 +1844,7 @@ static void dummy_timer(struct timer_list *t) 


		/* find the gadget's ep for this request (if configured) */

		address = usb_pipeendpoint (urb->pipe);

		if (usb_pipein(urb->pipe))

		if (usb_urb_dir_in(urb))

			address |= USB_DIR_IN;

		ep = find_endpoint(dum, address);

		if (!ep) {
@@ -2399,7 +2399,7 @@ static inline ssize_t show_urb(char *buf, size_t size, struct urb *urb) 
			s = "?";

			break;

		 } s; }),

		ep, ep ? (usb_pipein(urb->pipe) ? "in" : "out") : "",

		ep, ep ? (usb_urb_dir_in(urb) ? "in" : "out") : "",

		({ char *s; \

		switch (usb_pipetype(urb->pipe)) { \

		case PIPE_CONTROL: \