Merge "usb: gadget: f_mass_storage: Remove runtime async resume" (c116877c) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/usb/gadget/function/f_mass_storage.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -2229,8 +2229,6 @@ static int do_set_interface(struct fsg_common common, struct fsg_dev new_fsg)
		fsg->bulk_out_enabled = 0;
		}

		/* allow usb LPM after eps are disabled */
		usb_gadget_autopm_put_async(common->gadget);
		common->fsg = NULL;
		wake_up(&common->fsg_wait);
		}
		@@ -2295,9 +2293,6 @@ static int fsg_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
		{
		struct fsg_dev *fsg = fsg_from_func(f);

		/* prevents usb LPM until thread runs to completion */
		usb_gadget_autopm_get_async(fsg->common->gadget);

		__raise_exception(fsg->common, FSG_STATE_CONFIG_CHANGE, fsg);
		return USB_GADGET_DELAYED_STATUS;
		}