diff --git a/drivers/usb/gadget/android.c b/drivers/usb/gadget/android.c
old mode 100644
new mode 100755
index 59b4cffe2024b0f11e04fcb9d0266b02e458c812..ddeaf05d0dff04a1bd3fcca959e97d34df8198cb
--- 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 7fe802ac062c097621c96646bbdb7a3f605265fc..55cfb218284a7d8814187451ea7eb612077bb5c4
--- 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);