diff --git a/[refs] b/[refs] index 760296c31056..a8c9df4047e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 928dfa6c625c17d810ae3ee6c73dc37fc4b91bcd +refs/heads/master: 15d5a9acb1df1e22a7ba60aaaad758d9d71e5ea7 diff --git a/trunk/drivers/usb/gadget/fsl_qe_udc.c b/trunk/drivers/usb/gadget/fsl_qe_udc.c index d9aad6894b3e..1fe8b44787b3 100644 --- a/trunk/drivers/usb/gadget/fsl_qe_udc.c +++ b/trunk/drivers/usb/gadget/fsl_qe_udc.c @@ -1815,6 +1815,10 @@ static int qe_ep_set_halt(struct usb_ep *_ep, int value) udc->ep0_state = WAIT_FOR_SETUP; udc->ep0_dir = 0; } + + /* set data toggle to DATA0 on clear halt */ + if (value == 0) + ep->data01 = 0; out: dev_vdbg(udc->dev, "%s %s halt stat %d\n", ep->ep.name, value ? "set" : "clear", status);