This is a note to let you know that I've just added the patch titled usb: gadget: function: acm: make f_acm pass USB20CV Chapter9 to the 3.14-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: usb-gadget-function-acm-make-f_acm-pass-usb20cv-chapter9.patch and it can be found in the queue-3.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From balbi@xxxxxx Wed Nov 12 08:39:16 2014 From: Felipe Balbi <balbi@xxxxxx> Date: Mon, 10 Nov 2014 08:56:40 -0600 Subject: usb: gadget: function: acm: make f_acm pass USB20CV Chapter9 To: Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> Cc: <stable@xxxxxxxxxxxxxxx>, Felipe Balbi <balbi@xxxxxx> Message-ID: <1415631400-23406-1-git-send-email-balbi@xxxxxx> From: Felipe Balbi <balbi@xxxxxx> [ Upstream commit 52ec49a5e56a27c5b6f8217708783eff39f24c16 ] During Halt Endpoint Test, our interrupt endpoint will be disabled, which will clear out ep->desc to NULL. Unless we call config_ep_by_speed() again, we will not be able to enable this endpoint which will make us fail that test. Fixes: f9c56cd (usb: gadget: Clear usb_endpoint_descriptor inside the struct usb_ep on disable) Signed-off-by: Felipe Balbi <balbi@xxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/usb/gadget/f_acm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) --- a/drivers/usb/gadget/f_acm.c +++ b/drivers/usb/gadget/f_acm.c @@ -430,11 +430,12 @@ static int acm_set_alt(struct usb_functi if (acm->notify->driver_data) { VDBG(cdev, "reset acm control interface %d\n", intf); usb_ep_disable(acm->notify); - } else { - VDBG(cdev, "init acm ctrl interface %d\n", intf); + } + + if (!acm->notify->desc) if (config_ep_by_speed(cdev->gadget, f, acm->notify)) return -EINVAL; - } + usb_ep_enable(acm->notify); acm->notify->driver_data = acm; Patches currently in stable-queue which might be from balbi@xxxxxx are queue-3.14/usb-musb-cppi41-restart-hrtimer-only-if-not-yet-done.patch queue-3.14/usb-phy-return-enodev-on-failure-of-try_module_get.patch queue-3.14/usb-dwc3-gadget-fix-set_halt-bug-with-pending-transfers.patch queue-3.14/usb-musb-dsps-start-otg-timer-on-resume-again.patch queue-3.14/usb-gadget-function-acm-make-f_acm-pass-usb20cv-chapter9.patch queue-3.14/usb-dwc3-gadget-properly-initialize-link-trb.patch -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html