Merge "usb: gadget: f_mass_storage: Perform async runtime suspend after ep disable" into msm-4.9 (ce37527d) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/usb/gadget/function/f_mass_storage.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -2285,16 +2285,15 @@ 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);
		}

		common->running = 0;
		if (!new_fsg \|\| rc) {
		/* allow usb LPM after eps are disabled */
		usb_gadget_autopm_put_async(common->gadget);
		if (!new_fsg \|\| rc)
		return rc;
		}

		common->fsg = new_fsg;
		fsg = common->fsg;