releases/3.17.3/usb-gadget-function-acm-make-f_acm-pass-usb20cv-chapter9.patch

From balbi@ti.com  Wed Nov 12 08:39:16 2014
From: Felipe Balbi <balbi@ti.com>
Date: Mon, 10 Nov 2014 08:56:40 -0600
Subject: usb: gadget: function: acm: make f_acm pass USB20CV Chapter9
To: Greg KH <gregkh@linuxfoundation.org>
Cc: <stable@vger.kernel.org>, Felipe Balbi <balbi@ti.com>
Message-ID: <1415631400-23406-1-git-send-email-balbi@ti.com>

From: Felipe Balbi <balbi@ti.com>

[ 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@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/usb/gadget/function/f_acm.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- a/drivers/usb/gadget/function/f_acm.c
+++ b/drivers/usb/gadget/function/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;