Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2d0ed71 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'fixes-for-v3.5-rc1' of... 

Merge tag 'fixes-for-v3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus

usb: fixes for v3.5-rc1

Here you have the first set of fixes for our v3.5-rc cycle.

It contains a set regression fixes caused by Ido's
usb_endpoint_descriptor usage rework and a build
fix to the musb driver caused by recent changes to
the DaVinci tree.

Nothing really major, the fixes are quite obvious.
parents f8f5701b 08f75bf1

drivers/usb/gadget/atmel_usba_udc.c

+0 −6
Original line number Diff line number Diff line
@@ -599,12 +599,6 @@ usba_ep_enable(struct usb_ep *_ep, const struct usb_endpoint_descriptor *desc) 


	spin_lock_irqsave(&ep->udc->lock, flags);



	if (ep->ep.desc) {

		spin_unlock_irqrestore(&ep->udc->lock, flags);

		DBG(DBG_ERR, "ep%d already enabled\n", ep->index);

		return -EBUSY;

	}



	ep->ep.desc = desc;

	ep->ep.maxpacket = maxpacket;

drivers/usb/gadget/fsl_qe_udc.c

+1 −1
Original line number Diff line number Diff line
@@ -1596,7 +1596,7 @@ static int qe_ep_enable(struct usb_ep *_ep, 
	ep = container_of(_ep, struct qe_ep, ep);



	/* catch various bogus parameters */

	if (!_ep || !desc || ep->ep.desc || _ep->name == ep_name[0] ||

	if (!_ep || !desc || _ep->name == ep_name[0] ||

			(desc->bDescriptorType != USB_DT_ENDPOINT))

		return -EINVAL;

drivers/usb/gadget/fsl_udc_core.c

+2 −2
Original line number Diff line number Diff line
@@ -567,7 +567,7 @@ static int fsl_ep_enable(struct usb_ep *_ep, 
	ep = container_of(_ep, struct fsl_ep, ep);



	/* catch various bogus parameters */

	if (!_ep || !desc || ep->ep.desc

	if (!_ep || !desc

			|| (desc->bDescriptorType != USB_DT_ENDPOINT))

		return -EINVAL;
@@ -2575,7 +2575,7 @@ static int __init fsl_udc_probe(struct platform_device *pdev) 
	/* for ep0: the desc defined here;

	 * for other eps, gadget layer called ep_enable with defined desc

	 */

	udc_controller->eps[0].desc = &fsl_ep0_desc;

	udc_controller->eps[0].ep.desc = &fsl_ep0_desc;

	udc_controller->eps[0].ep.maxpacket = USB_MAX_CTRL_PAYLOAD;



	/* setup the udc->eps[] for non-control endpoints and link

drivers/usb/gadget/fsl_usb2_udc.h

+2 −2
Original line number Diff line number Diff line
@@ -568,10 +568,10 @@ static void dump_msg(const char *label, const u8 * buf, unsigned int length) 
/*

 * ### internal used help routines.

 */

#define ep_index(EP)		((EP)->desc->bEndpointAddress&0xF)

#define ep_index(EP)		((EP)->ep.desc->bEndpointAddress&0xF)

#define ep_maxpacket(EP)	((EP)->ep.maxpacket)

#define ep_is_in(EP)	( (ep_index(EP) == 0) ? (EP->udc->ep0_dir == \

			USB_DIR_IN ):((EP)->desc->bEndpointAddress \

			USB_DIR_IN) : ((EP)->ep.desc->bEndpointAddress \

			& USB_DIR_IN)==USB_DIR_IN)

#define get_ep_by_pipe(udc, pipe)	((pipe == 1)? &udc->eps[0]: \

					&udc->eps[pipe])

drivers/usb/gadget/goku_udc.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ goku_ep_enable(struct usb_ep *_ep, const struct usb_endpoint_descriptor *desc) 
	unsigned long	flags;



	ep = container_of(_ep, struct goku_ep, ep);

	if (!_ep || !desc || ep->ep.desc

	if (!_ep || !desc

			|| desc->bDescriptorType != USB_DT_ENDPOINT)

		return -EINVAL;

	dev = ep->dev;