From 716c2df0cbf148821448760c60cae609b1d2528a Mon Sep 17 00:00:00 2001
From: Zhang Wei <zhangwei519@huawei.com>
Date: Thu, 27 Apr 2017 17:09:26 +0800
Subject: [PATCH] USB: gadget: use CONFIG_USB_CONFIGFS_F_ACC macro to
 disable/enable accessory function

Change-Id: I9004ec45bd376a3fd586f3d4830dfdef025957d6
Signed-off-by: c00187401 <c00187401@notesmail.huawei.com>
---
 drivers/usb/gadget/android.c  | 2 ++
 drivers/usb/gadget/configfs.c | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 drivers/usb/gadget/android.c
 mode change 100644 => 100755 drivers/usb/gadget/configfs.c

diff --git a/drivers/usb/gadget/android.c b/drivers/usb/gadget/android.c
old mode 100644
new mode 100755
index 59b4cffe2024..ddeaf05d0dff
--- a/drivers/usb/gadget/android.c
+++ b/drivers/usb/gadget/android.c
@@ -3865,8 +3865,10 @@ android_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *c)
 	/* Special case the accessory function.
 	 * It needs to handle control requests before it is enabled.
 	 */
+#ifdef CONFIG_USB_CONFIGFS_F_ACC
 	if (value < 0)
 		value = acc_ctrlrequest(cdev, c);
+#endif
 
 	if (value < 0)
 		value = composite_setup_func(gadget, c);
diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c
old mode 100644
new mode 100755
index 7fe802ac062c..55cfb218284a
--- a/drivers/usb/gadget/configfs.c
+++ b/drivers/usb/gadget/configfs.c
@@ -1564,7 +1564,6 @@ static int android_setup(struct usb_gadget *gadget,
 				break;
 		}
 	}
-
 #ifdef CONFIG_USB_CONFIGFS_F_ACC
 	if (value < 0)
 		value = acc_ctrlrequest(cdev, c);
-- 
GitLab