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

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

Merge "USB: f_mass_storage: Send GADGET_DELAYED_STATUS for MSC RESET command"

parents e821ac8f 44aa91e9

drivers/usb/gadget/composite.c

+8 −0
Original line number Diff line number Diff line
@@ -1940,6 +1940,14 @@ unknown: 
			if (f->setup)

				value = f->setup(f, ctrl);

		}

		if (value == USB_GADGET_DELAYED_STATUS) {

			DBG(cdev,

			 "%s: interface %d (%s) requested delayed status\n",

					__func__, intf, f->name);

			cdev->delayed_status++;

			DBG(cdev, "delayed_status count %d\n",

					cdev->delayed_status);

		}



		goto done;

	}

drivers/usb/gadget/function/f_mass_storage.c

+7 −3
Original line number Diff line number Diff line
@@ -2603,9 +2603,13 @@ static void handle_exception(struct fsg_common *common) 
				       &common->fsg->atomic_bitflags))

			usb_ep_clear_halt(common->fsg->bulk_in);



		if (common->ep0_req_tag == exception_req_tag)

			ep0_queue(common);	/* Complete the status stage */



		if (common->ep0_req_tag == exception_req_tag) {

			/* Complete the status stage */

			if (common->cdev)

				usb_composite_setup_continue(common->cdev);

			else

				ep0_queue(common);

		}

		/*

		 * Technically this should go here, but it would only be

		 * a waste of time.  Ditto for the INTERFACE_CHANGE and