commit c1bc698f4979e22c4aa6abb5ea4a56eb6d094330
author Linux Build Service Account <lnxbuild@localhost> Fri Apr 20 03:04:31 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Apr 20 03:04:30 2018 -0700
tree 1c28ac0f1991872314c03c8f0cf3d08c4941d245
parent fc33732a3b41442750463b4f7318199b84b73e5a
parent dd11a24710ed48bf8f9c9fbe5216d46d5b72915a

Merge "usb: gadget: ffs: Fix runtime PM usage count for multiple set_alt"

drivers/usb/gadget/function/f_fs.c

diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
index 47f1a8e..7897f68 100644
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@ -1404,7 +1404,7 @@
 		*to = p->data;
 	}
 
-	ffs_log("enter");
+	ffs_log("exit");
 
 	return res;
 }
@@ -3633,6 +3633,8 @@
 	if (ffs->func) {
 		ffs_func_eps_disable(ffs->func);
 		ffs->func = NULL;
+		/* matching put to allow LPM on disconnect */
+		usb_gadget_autopm_put_async(ffs->gadget);
 	}
 
 	if (ffs->state == FFS_DEACTIVATED) {
@@ -3665,13 +3667,9 @@
 
 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");
 }