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

Commit 655403c2 authored by Pratyush Anand's avatar Pratyush Anand Committed by Felipe Balbi
Browse files

usb: gadget: mass storage: fix return of delayed status 



Mass storage gadget returns DELAYED_STATUS in stead of
USB_GADGET_DELAYED_STATUS while handling bulk reset request. Since
peripheral driver uses USB_GADGET_DELAYED_STATUS for delayed status
handling, therefore replace DELAYED_STATUS by USB_GADGET_DELAYED_STATUS
in mass storage driver.

Since, DELAYED_STATUS and hence EP0_BUFSIZE will no longer be used now,
so remove them.

Signed-off-by: default avatarPratyush Anand <pratyush.anand@st.com>
Cc: Paul Zimmerman <Paul.Zimmerman@synopsys.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent bc912b0d

drivers/usb/gadget/f_mass_storage.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -523,7 +523,7 @@ static int fsg_setup(struct usb_function *f, 
		 */

		 */

		DBG(fsg, "bulk reset request\n");

		DBG(fsg, "bulk reset request\n");

		raise_exception(fsg->common, FSG_STATE_RESET);

		raise_exception(fsg->common, FSG_STATE_RESET);

		return DELAYED_STATUS;

		return USB_GADGET_DELAYED_STATUS;





	case US_BULK_GET_MAX_LUN:

	case US_BULK_GET_MAX_LUN:

		if (ctrl->bRequestType !=

		if (ctrl->bRequestType !=

drivers/usb/gadget/storage_common.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -119,10 +119,6 @@ static inline bool fsg_lun_is_open(struct fsg_lun *curlun) 
	return curlun->filp != NULL;

	return curlun->filp != NULL;

}

}





/* Big enough to hold our biggest descriptor */

#define EP0_BUFSIZE	256

#define DELAYED_STATUS	(EP0_BUFSIZE + 999)	/* An impossibly large value */



/* Default size of buffer length. */

/* Default size of buffer length. */

#define FSG_BUFLEN	((u32)16384)

#define FSG_BUFLEN	((u32)16384)