Merge "USB: composite: Check return value before composite_setup_complete()" (bc96a4dc) · Commits · e / devices / android_kernel_sony_msm8998

drivers/usb/gadget/composite.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -1942,7 +1942,9 @@ unknown:
		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;
		}
		@@ -2031,6 +2033,7 @@ try_fun_setup:
		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) {