[09/28] usb: gadget: function: acm: make f_acm pass USB20CV Chapter9

Message ID 1413565804-13061-10-git-send-email-balbi@ti.com
State Accepted
Commit 52ec49a5e56a27c5b6f8217708783eff39f24c16
Headers show

Commit Message

Felipe Balbi Oct. 17, 2014, 5:09 p.m.
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)
Cc: <stable@vger.kernel.org> # v3.4+
Signed-off-by: Felipe Balbi <balbi@ti.com>
 drivers/usb/gadget/function/f_acm.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


diff --git a/drivers/usb/gadget/function/f_acm.c b/drivers/usb/gadget/function/f_acm.c
index 6da4685..aad8165 100644
--- a/drivers/usb/gadget/function/f_acm.c
+++ b/drivers/usb/gadget/function/f_acm.c
@@ -433,12 +433,12 @@  static int acm_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
 				 "reset acm control interface %d\n", intf);
-		} else {
-			dev_vdbg(&cdev->gadget->dev,
-				 "init acm ctrl interface %d\n", intf);
+		}
+		if (!acm->notify->desc)
 			if (config_ep_by_speed(cdev->gadget, f, acm->notify))
 				return -EINVAL;
-		}
 		acm->notify->driver_data = acm;