commit fbe379cb3a83939795a2d090decc6b2732951975
author Linux Build Service Account <lnxbuild@localhost> Thu Jul 12 05:37:35 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Jul 12 05:37:34 2018 -0700
tree 1ed804f1317f510a849dd3ff38071cb2cf11ee25
parent 855b1c96385b8948fe06b7a958043630a02393a3
parent 4824a57314154116875e7f065652f82b1ae85276

Merge "usb: f_gsi: Disable function remote wake-up capability for DPL"

drivers/usb/gadget/function/f_gsi.c

diff --git a/drivers/usb/gadget/function/f_gsi.c b/drivers/usb/gadget/function/f_gsi.c
index b7fcc35..0c4baf2 100644
--- a/drivers/usb/gadget/function/f_gsi.c
+++ b/drivers/usb/gadget/function/f_gsi.c
@@ -2565,6 +2565,11 @@
 static int gsi_get_status(struct usb_function *f)
 {
 	unsigned int remote_wakeup_en_status = f->func_wakeup_allowed ? 1 : 0;
+	struct f_gsi *gsi = func_to_gsi(f);
+
+	/* Disable function remote wake-up for DPL interface */
+	if (gsi->prot_id == USB_PROT_DIAG_IPA)
+		return 0;
 
 	return (remote_wakeup_en_status << FUNC_WAKEUP_ENABLE_SHIFT) |
 		(1 << FUNC_WAKEUP_CAPABLE_SHIFT);