summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRama Kandhala <rkandhala@nvidia.com>2010-09-28 15:03:03 +0530
committerBharat Nihalani <bnihalani@nvidia.com>2010-09-30 23:23:13 -0700
commitb50b242037add491f8ccc2859c4e0ed3cd7468f6 (patch)
tree5559ee8374823b980e39fe4d8bceecfbd3991d46
parent7b58d6bfad87dc9b7ccbe1b1e953bf5d76908db2 (diff)
[tegra-udc] Fix device compliance test
On k32, remote wake up is enabled in the descriptor based on gadget->ops. Since, remote wakeup is not supported, disabled gadget->op->remote_wakeup based on USB_ANDROID. Bug 710624 (cherry picked from commit c0340053278c9c9ceb98772cc3566d298dca4d9a) Change-Id: I760632dd38a9f56dadfbb4d446e83f28cdb5338f Reviewed-on: http://git-master/r/7556 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Reviewed-by: Hanumanth Venkateswa Moganty <vmoganty@nvidia.com> Tested-by: Hanumanth Venkateswa Moganty <vmoganty@nvidia.com>
-rw-r--r--drivers/usb/gadget/fsl_udc_core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c
index 31d6f84a10d8..ea7d9d6182bb 100644
--- a/drivers/usb/gadget/fsl_udc_core.c
+++ b/drivers/usb/gadget/fsl_udc_core.c
@@ -1251,7 +1251,9 @@ static int fsl_pullup(struct usb_gadget *gadget, int is_on)
/* defined in gadget.h */
static struct usb_gadget_ops fsl_gadget_ops = {
.get_frame = fsl_get_frame,
+#ifndef CONFIG_USB_ANDROID
.wakeup = fsl_wakeup,
+#endif
/* .set_selfpowered = fsl_set_selfpowered, */ /* Always selfpowered */
.vbus_session = fsl_vbus_session,
.vbus_draw = fsl_vbus_draw,