Commit 7f67c38b authored Sep 12, 2012 by Michael Grzeschik Committed by Greg Kroah-Hartman Sep 12, 2012

usb: chipidea: udc: fix setup of endpoint maxpacket size



This patch changes the setup of the endpoint maxpacket size. All non control
endpoints are initialized with an undefined ((unsigned short)~0) maxpacket
size. The maxpacket size of Endpoint 0 will be kept at CTRL_PAYLOAD_MAX.

Some gadget drivers check for the maxpacket size before they enable the
endpoint, which leads to a wrong state in these drivers.

Cc: stable <stable@vger.kernel.org>
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent fea7a08a

drivers/usb/chipidea/udc.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -1455,7 +1455,12 @@ static int init_eps(struct ci13xxx *ci)

		mEp->ep.name = mEp->name;
		mEp->ep.ops = &usb_ep_ops;
		mEp->ep.maxpacket = CTRL_PAYLOAD_MAX;
		/*
		* for ep0: maxP defined in desc, for other
		* eps, maxP is set by epautoconfig() called
		* by gadget layer
		*/
		mEp->ep.maxpacket = (unsigned short)~0;

		INIT_LIST_HEAD(&mEp->qh.queue);
		mEp->qh.ptr = dma_pool_alloc(ci->qh_pool, GFP_KERNEL,
		@@ -1475,6 +1480,7 @@ static int init_eps(struct ci13xxx *ci)
		else
		ci->ep0in = mEp;

		mEp->ep.maxpacket = CTRL_PAYLOAD_MAX;
		continue;
		}