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

Commit b00ce11f authored by Michal Nazarewicz's avatar Michal Nazarewicz Committed by Greg Kroah-Hartman
Browse files

USB: g_mass_storage: superfluous and missing packets fixed 



The mass storage function responded needlessly to a set
configuration packet.  This was a leftover from converting
gadget (file storage gadget) into a composite function.

Moreover, it has failed to respond to get max LUN request.
Adding request queueing made the function work better.

Signed-off-by: default avatarMichal Nazarewicz <m.nazarewicz@samsung.com>
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7f1ee826

drivers/usb/gadget/f_mass_storage.c

+6 −9
Original line number Diff line number Diff line
@@ -618,7 +618,12 @@ static int fsg_setup(struct usb_function *f, 
			return -EDOM;

		VDBG(fsg, "get max LUN\n");

		*(u8 *) req->buf = fsg->common->nluns - 1;

		return 1;



		/* Respond with data/status */

		req->length = min(1, w_length);

		fsg->common->ep0req_name =

			ctrl->bRequestType & USB_DIR_IN ? "ep0-in" : "ep0-out";

		return ep0_queue(fsg->common);

	}



	VDBG(fsg,
@@ -2528,14 +2533,6 @@ static void handle_exception(struct fsg_common *common) 


	case FSG_STATE_CONFIG_CHANGE:

		rc = do_set_config(common, new_config);

		if (common->ep0_req_tag != exception_req_tag)

			break;

		if (rc != 0) {			/* STALL on errors */

			DBG(common, "ep0 set halt\n");

			usb_ep_set_halt(common->ep0);

		} else {			/* Complete the status stage */

			ep0_queue(common);

		}

		break;



	case FSG_STATE_EXIT: