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

Commit 80e91fd5 authored by Christoph Fritz's avatar Christoph Fritz Committed by Felipe Balbi
Browse files

usb: gadget: regression fix - usage of usb_ep 



This patch removes redundant pointer to struct usb_endpoint_descriptor which
were missed in commit 79149b8b:

 usb: gadget: Update fsl_udc_core to use usb_endpoint_descriptor inside the
 struct usb_ep

Due to clock framework regressions, this patch is only compile tested!

Signed-off-by: default avatarChristoph Fritz <chf.fritz@googlemail.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 109f0f71

drivers/usb/gadget/fsl_udc_core.c

+1 −1
Original line number Diff line number Diff line
@@ -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])