diff options
| author | Zhang Wei <zhangwei519@huawei.com> | 2017-04-27 17:09:26 +0800 |
|---|---|---|
| committer | Zhang Wei <zhangwei519@huawei.com> | 2017-04-27 17:09:26 +0800 |
| commit | 716c2df0cbf148821448760c60cae609b1d2528a (patch) | |
| tree | 398e63517e3105fdeef2206392abe38b1e019034 | |
| parent | 9a01e6bbea1a5b0efc14ad29e2595e535548bc24 (diff) | |
USB: gadget: use CONFIG_USB_CONFIGFS_F_ACC macro to disable/enable accessory functionandroid-wear-7.1.1_r0.22
Change-Id: I9004ec45bd376a3fd586f3d4830dfdef025957d6
Signed-off-by: c00187401 <c00187401@notesmail.huawei.com>
| -rwxr-xr-x[-rw-r--r--] | drivers/usb/gadget/android.c | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | drivers/usb/gadget/configfs.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/gadget/android.c b/drivers/usb/gadget/android.c index 59b4cffe2024..ddeaf05d0dff 100644..100755 --- 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 index 7fe802ac062c..55cfb218284a 100644..100755 --- 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); |