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

Commit 6ee59a99 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "USB: composite: Check return value before composite_setup_complete()"

parents 491e16bb f860e745

drivers/usb/gadget/composite.c

+5 −3
Original line number Diff line number Diff line
@@ -2013,8 +2013,9 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) 
				if (value < 0) {

					DBG(cdev, "ep_queue --> %d\n", value);

					req->status = 0;

					composite_setup_complete(gadget->ep0,

								 req);

					if (value != -ESHUTDOWN)

						composite_setup_complete(

							gadget->ep0, req);

				}

			}

			return value;
@@ -2108,6 +2109,7 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) 
		if (value < 0) {

			DBG(cdev, "ep_queue --> %d\n", value);

			req->status = 0;

			if (value != -ESHUTDOWN)

				composite_setup_complete(gadget->ep0, req);

		}

	} else if (value == USB_GADGET_DELAYED_STATUS && w_length != 0) {