Merge "USB: f_fs: Disable USB LPM on bus_suspend with ADB" into msm-4.8 (0cfb5ffa) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/usb/gadget/function/f_fs.c

+9 −2

Original line number	Diff line number	Diff line
		@@ -3534,9 +3534,11 @@ static int ffs_func_set_alt(struct usb_function *f,

		ffs->func = func;
		ret = ffs_func_eps_enable(func);
		if (likely(ret >= 0))
		if (likely(ret >= 0)) {
		ffs_event_add(ffs, FUNCTIONFS_ENABLE);

		/* Disable USB LPM later on bus_suspend */
		usb_gadget_autopm_get_async(ffs->gadget);
		}
		ffs_log("exit: ret %d", ret);

		return ret;
		@@ -3544,8 +3546,13 @@ static int ffs_func_set_alt(struct usb_function *f,

		static void ffs_func_disable(struct usb_function *f)
		{
		struct ffs_function *func = ffs_func_from_usb(f);
		struct ffs_data *ffs = func->ffs;

		ffs_log("enter");
		ffs_func_set_alt(f, 0, (unsigned)-1);
		/* matching put to allow LPM on disconnect */
		usb_gadget_autopm_put_async(ffs->gadget);
		ffs_log("exit");
		}